removed lapack guard from LMNN files

shogun-toolbox · Mar 4, 2014 · 936868b · 936868b
1 parent 1768a47
commit 936868b
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 12 deletions.
diff --git a/src/shogun/metric/LMNN.cpp b/src/shogun/metric/LMNN.cpp
@@ -9,7 +9,6 @@
  */
 
 #ifdef HAVE_EIGEN3
-#ifdef HAVE_LAPACK
 
 #include <shogun/metric/LMNN.h>
 #include <shogun/metric/LMNNImpl.h>
@@ -351,5 +350,4 @@ void CLMNNStatistics::init()
 			MS_NOT_AVAILABLE);
 }
 
-#endif /* HAVE_LAPACK */
 #endif /* HAVE_EIGEN3 */
diff --git a/src/shogun/metric/LMNN.h b/src/shogun/metric/LMNN.h
@@ -14,7 +14,6 @@
 #include <shogun/lib/config.h>
 
 #ifdef HAVE_EIGEN3
-#ifdef HAVE_LAPACK
 
 #include <shogun/base/SGObject.h>
 #include <shogun/distance/CustomMahalanobisDistance.h>
@@ -297,7 +296,6 @@ class CLMNNStatistics : public CSGObject
 
 } /* namespace shogun */
 
-#endif /* HAVE_LAPACK */
 #endif /* HAVE_EIGEN3 */
 
 #endif /* LMNN_H_ */
diff --git a/src/shogun/metric/LMNNImpl.cpp b/src/shogun/metric/LMNNImpl.cpp
@@ -9,7 +9,6 @@
  */
 
 #ifdef HAVE_EIGEN3
-#ifdef HAVE_LAPACK
 
 #include <shogun/metric/LMNNImpl.h>
 #include <shogun/multiclass/KNN.h>
@@ -545,5 +544,4 @@ CEuclideanDistance* CLMNNImpl::setup_distance(CDenseFeatures<float64_t>* x,
 	return euclidean;
 }
 
-#endif /* HAVE_LAPACK */
 #endif /* HAVE_EIGEN3 */
diff --git a/src/shogun/metric/LMNNImpl.h b/src/shogun/metric/LMNNImpl.h
@@ -14,7 +14,6 @@
 #include <shogun/lib/config.h>
 
 #ifdef HAVE_EIGEN3
-#ifdef HAVE_LAPACK
 
 #include <shogun/lib/common.h>
 #include <shogun/lib/SGMatrix.h>
@@ -158,7 +157,6 @@ class CLMNNImpl
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
-#endif /* HAVE_LAPACK */
 #endif /* HAVE_EIGEN3 */
 
 #endif /* _LMNNIMPL_H_ */
diff --git a/tests/unit/metric/LMNNImpl_unittest.cc b/tests/unit/metric/LMNNImpl_unittest.cc
@@ -15,7 +15,6 @@
 using namespace shogun;
 
 #ifdef HAVE_EIGEN3
-#ifdef HAVE_LAPACK
 
 TEST(LMNNImpl,find_target_nn)
 {
@@ -192,5 +191,4 @@ TEST(LMNNImpl,find_impostors_exact)
 	SG_UNREF(labels)
 }
 
-#endif /* HAVE_LAPACK */
 #endif /* HAVE_EIGEN3 */
diff --git a/tests/unit/metric/LMNN_unittest.cc b/tests/unit/metric/LMNN_unittest.cc
@@ -14,7 +14,7 @@
 
 using namespace shogun;
 
-#if defined(HAVE_EIGEN3) && defined(HAVE_LAPACK)
+#ifdef HAVE_EIGEN3
 TEST(LMNN,train_identity_init)
 {
 	// create features, each column is a feature vector
@@ -157,4 +157,4 @@ TEST(LMNN,train_diagonal)
 
 	SG_UNREF(lmnn)
 }
-#endif /* HAVE_LAPACK && HAVE_EIGEN3 */
+#endif /* HAVE_EIGEN3 */