[mlpack-git] master: Fix documentation, pointed out by Marcus. Also fix the return type when we can't transpose. (501f681)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Tue Mar 3 15:43:34 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/c95c28dd2ac90c4b1fdd5d658302d78f319738d2...501f681837db338753cf94dfc3e5b740ba9218e7
>---------------------------------------------------------------
commit 501f681837db338753cf94dfc3e5b740ba9218e7
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.
>---------------------------------------------------------------
501f681837db338753cf94dfc3e5b740ba9218e7
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