[mlpack-git] master: Compiles on VC14 (d4e6af5)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Tue Nov 24 11:22:40 EST 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ec8a15165b12c246df58cb5e66afe1c6d865ce07...c627ed77fb6d805bba31768003d3dcfea2a1685c

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

commit d4e6af5d37df5b1c7209f173016ab6d71e3aba1e
Author: theSundayProgrammer <joe.mariadassou at gmail.com>
Date:   Sat Nov 21 17:35:09 2015 +1100

    Compiles on VC14


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

d4e6af5d37df5b1c7209f173016ab6d71e3aba1e
 src/mlpack/core/util/arma_config.hpp            | 16 ++++++++++++++++
 src/mlpack/methods/neighbor_search/ns_model.hpp |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/core/util/arma_config.hpp b/src/mlpack/core/util/arma_config.hpp
new file mode 100644
index 0000000..52e18d1
--- /dev/null
+++ b/src/mlpack/core/util/arma_config.hpp
@@ -0,0 +1,16 @@
+/**
+ * @file arma_config_check.hpp
+ * @author Ryan Curtin
+ *
+ * Using the contents of arma_config.hpp, try to catch the condition where the
+ * user has included mlpack with ARMA_64BIT_WORD enabled but mlpack was compiled
+ * without ARMA_64BIT_WORD enabled.  This should help prevent a long, drawn-out
+ * debugging process where nobody can figure out why the stack is getting
+ * mangled.
+ */
+#ifndef __MLPACK_CORE_UTIL_ARMA_CHECK_HPP
+#define __MLPACK_CORE_UTIL_ARMA_CHECK_HPP
+
+
+
+#endif
diff --git a/src/mlpack/methods/neighbor_search/ns_model.hpp b/src/mlpack/methods/neighbor_search/ns_model.hpp
index cb51e6a..8fae63b 100644
--- a/src/mlpack/methods/neighbor_search/ns_model.hpp
+++ b/src/mlpack/methods/neighbor_search/ns_model.hpp
@@ -64,7 +64,8 @@ class NSModel
   using NSType = NeighborSearch<SortPolicy,
                                 metric::EuclideanDistance,
                                 arma::mat,
-                                TreeType>;
+                                TreeType, 
+	                             TreeType<metric::EuclideanDistance, NeighborSearchStat<SortPolicy>,arma::mat>::template DualTreeTraverser>;
 
   // Only one of these pointers will be non-NULL.
   NSType<tree::KDTree>* kdTreeNS;



More information about the mlpack-git mailing list