[mlpack-svn] r13398 - in mlpack/trunk/src/mlpack: . tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Aug 15 12:46:24 EDT 2012
Author: rcurtin
Date: 2012-08-15 12:46:23 -0400 (Wed, 15 Aug 2012)
New Revision: 13398
Modified:
mlpack/trunk/src/mlpack/core.hpp
mlpack/trunk/src/mlpack/tests/allknn_test.cpp
Log:
Comment out some debugging output.
Modified: mlpack/trunk/src/mlpack/core.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core.hpp 2012-08-15 16:45:38 UTC (rev 13397)
+++ mlpack/trunk/src/mlpack/core.hpp 2012-08-15 16:46:23 UTC (rev 13398)
@@ -174,11 +174,11 @@
// Give ourselves a nice way to force functions to be inline if we need.
#define force_inline
-#if defined(__GNUG__)
+#if defined(__GNUG__) && !defined(DEBUG)
#undef force_inline
- #define force_inline __attribute__((always_inline))
+ #define force_inline __attribute__((noinline))
#elif defined(_MSC_VER)
- #undef force_inline
+ #undef force_inline && !defined(DEBUG)
#define force_inline __forceinline
#endif
Modified: mlpack/trunk/src/mlpack/tests/allknn_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2012-08-15 16:45:38 UTC (rev 13397)
+++ mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2012-08-15 16:46:23 UTC (rev 13398)
@@ -478,8 +478,9 @@
BOOST_AUTO_TEST_CASE(DualCoverTreeTest)
{
arma::mat dataset;
- srand(time(NULL));
- dataset.randn(5, 5000);
+// srand(time(NULL));
+// dataset.randn(5, 5000);
+ data::Load("test_data_3_1000.csv", dataset);
arma::mat kdtreeData(dataset);
@@ -505,6 +506,14 @@
for (size_t i = 0; i < coverNeighbors.n_cols; ++i)
{
+// Log::Debug << "cover neighbors col " << i << "\n" <<
+// trans(coverNeighbors.col(i));
+// Log::Debug << "cover distances col " << i << "\n" <<
+// trans(coverDistances.col(i));
+// Log::Debug << "kd neighbors col " << i << "\n" <<
+// trans(kdNeighbors.col(i));
+// Log::Debug << "kd distances col " << i << "\n" <<
+// trans(kdDistances.col(i));
for (size_t j = 0; j < coverNeighbors.n_rows; ++j)
{
BOOST_REQUIRE_EQUAL(coverNeighbors(j, i), kdNeighbors(j, i));
More information about the mlpack-svn
mailing list