[mlpack-git] master: Changes placeholder code for OpenMP (7cf77cd)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/34cf8d94f79c9a72ff4199676033b060cd039fcd...425324bf7fb7c86c85d10a909d8a59d4f69b7164

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

commit 7cf77cdffbf26f84cc34adbcae54848182a90778
Author: Yannis Mentekidis <mentekid at gmail.com>
Date:   Mon Jun 27 11:08:34 2016 +0100

    Changes placeholder code for OpenMP


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

7cf77cdffbf26f84cc34adbcae54848182a90778
 src/mlpack/methods/lsh/lsh_search_impl.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/methods/lsh/lsh_search_impl.hpp b/src/mlpack/methods/lsh/lsh_search_impl.hpp
index 6ec13d8..0a20bb3 100644
--- a/src/mlpack/methods/lsh/lsh_search_impl.hpp
+++ b/src/mlpack/methods/lsh/lsh_search_impl.hpp
@@ -447,10 +447,11 @@ void LSHSearch<SortPolicy>::ReturnIndicesFromTable(
     // Only keep reference points found in at least one bucket. If OpenMP is
     // found, do it in parallel
     #ifdef _OPENMP
+      // TODO: change this to our own function?
       referenceIndices = arma::find(refPointsConsidered > 0);
       return;
     #else
-      referenceIndices = OmpFind(refPointsConsideredSmall);
+      referenceIndices = arma::find(refPointsConsidered > 0);
       return;
     #endif
   }
@@ -497,10 +498,11 @@ void LSHSearch<SortPolicy>::ReturnIndicesFromTable(
 
     // Only keep unique candidates. If OpenMP is found, do it in parallel.
     #ifdef _OPENMP
+      // TODO: change this to our own function?
       referenceIndices = arma::unique(refPointsConsideredSmall);
       return;
     #else
-      referenceIndices = OmpUnique(refPointsConsideredSmall);
+      referenceIndices = arma::unique(refPointsConsideredSmall);
       return;
     #endif
   }