[mlpack-git] master: Fix documentation, pointed out by Marcus. Also fix the return type when we can't transpose. (3642663)

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


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

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

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

commit 3642663285cceb86b25cf54e8594be80d5ff67d4
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Mar 3 15:43:16 2015 -0500

    Fix documentation, pointed out by Marcus.
    Also fix the return type when we can't transpose.


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

3642663285cceb86b25cf54e8594be80d5ff67d4
 src/mlpack/core/data/load_impl.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/core/data/load_impl.hpp b/src/mlpack/core/data/load_impl.hpp
index 1a5921c..9407346 100644
--- a/src/mlpack/core/data/load_impl.hpp
+++ b/src/mlpack/core/data/load_impl.hpp
@@ -29,13 +29,13 @@ bool inline inplace_transpose(arma::Mat<eT>& X)
 #if (ARMA_VERSION_MAJOR >= 4) || \
     ((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR >= 930))
     arma::inplace_trans(X, "lowmem");
+    return true;
 #else
-    Log::Fatal << "inplace_transpose is only available on "
-      << "Armadillo 4.xxx.x or higher. Ran out of memory to "
-      << "transpose matrix."
-      << std::endl;
+    Log::Fatal << "data::Load(): inplace_trans() is only available on Armadillo"
+        << " 3.930 or higher. Ran out of memory to transpose matrix."
+        << std::endl;
+    return false;
 #endif
-    return true;
   }
 }
 



More information about the mlpack-git mailing list