[mlpack-git] master: Armadillo 3.930+ supports inplace_trans() too. (0a7c4f4)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:17:40 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit 0a7c4f46519789da838591cf068f43227a7ea56f
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Mar 3 11:31:31 2015 -0500

    Armadillo 3.930+ supports inplace_trans() too.


>---------------------------------------------------------------

0a7c4f46519789da838591cf068f43227a7ea56f
 src/mlpack/core/data/load_impl.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/core/data/load_impl.hpp b/src/mlpack/core/data/load_impl.hpp
index 593f455..1a5921c 100644
--- a/src/mlpack/core/data/load_impl.hpp
+++ b/src/mlpack/core/data/load_impl.hpp
@@ -26,7 +26,8 @@ bool inline inplace_transpose(arma::Mat<eT>& X)
   }
   catch (std::bad_alloc& exception)
   {
-#if ARMA_VERSION_MAJOR >= 4
+#if (ARMA_VERSION_MAJOR >= 4) || \
+    ((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR >= 930))
     arma::inplace_trans(X, "lowmem");
 #else
     Log::Fatal << "inplace_transpose is only available on "



More information about the mlpack-git mailing list