[mlpack-svn] r15212 - in mlpack/trunk/src/mlpack: methods tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Jun 7 15:51:16 EDT 2013
Author: rcurtin
Date: 2013-06-07 15:51:16 -0400 (Fri, 07 Jun 2013)
New Revision: 15212
Modified:
mlpack/trunk/src/mlpack/methods/CMakeLists.txt
mlpack/trunk/src/mlpack/tests/CMakeLists.txt
Log:
Do not compile DET code on Windows because it causes the compiler to segfault.
Sigh...
Modified: mlpack/trunk/src/mlpack/methods/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/CMakeLists.txt 2013-06-07 18:22:55 UTC (rev 15211)
+++ mlpack/trunk/src/mlpack/methods/CMakeLists.txt 2013-06-07 19:51:16 UTC (rev 15212)
@@ -1,6 +1,5 @@
-## recurse
+## Recurse into different methods.
set(DIRS
- det
emst
fastmks
gmm
@@ -22,6 +21,10 @@
rann
sparse_coding
)
+# Density estimation trees fail on Windows.
+if (NOT WIN32)
+ set(DIRS ${DIRS} det)
+endif (NOT WIN32)
foreach(dir ${DIRS})
add_subdirectory(${dir})
Modified: mlpack/trunk/src/mlpack/tests/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/tests/CMakeLists.txt 2013-06-07 18:22:55 UTC (rev 15211)
+++ mlpack/trunk/src/mlpack/tests/CMakeLists.txt 2013-06-07 19:51:16 UTC (rev 15212)
@@ -1,5 +1,5 @@
# MLPACK test executable.
-add_executable(mlpack_test
+set(TEST_SOURCES
mlpack_test.cpp
allkfn_test.cpp
allknn_test.cpp
@@ -7,7 +7,6 @@
arma_extend_test.cpp
aug_lagrangian_test.cpp
cli_test.cpp
- det_test.cpp
distribution_test.cpp
emst_test.cpp
fastmks_test.cpp
@@ -38,6 +37,13 @@
tree_traits_test.cpp
union_find_test.cpp
)
+# On Windows, we don't include the test for density estimation trees.
+set(TEST_SOURCES ${TEST_SOURCES} det_test.cpp)
+
+add_executable(mlpack_test
+ ${TEST_SOURCES}
+)
+
# Link dependencies of test executable.
target_link_libraries(mlpack_test
mlpack
More information about the mlpack-svn
mailing list