Merge pull request #2083 from sunil1337/lapack_fix

fixed compile error when lapack not installed for logdet constructor and its unit test
shogun-toolbox · Mar 25, 2014 · 5b7df93 · 5b7df93
2 parents a5685e5 + 7bff52b
commit 5b7df93
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.cpp b/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.cpp
@@ -36,6 +36,7 @@ CLogDetEstimator::CLogDetEstimator()
 	init();
 }
 
+#ifdef HAVE_LAPACK
 #ifdef HAVE_EIGEN3
 CLogDetEstimator::CLogDetEstimator(SGSparseMatrix<float64_t> sparse_mat) 
 	: CSGObject()
@@ -70,6 +71,7 @@ CLogDetEstimator::CLogDetEstimator(SGSparseMatrix<float64_t> sparse_mat)
 		m_trace_sampler->get_name());
 }
 #endif //HAVE_EIGEN3
+#endif //HAVE_LAPACK
 
 CLogDetEstimator::CLogDetEstimator(CTraceSampler* trace_sampler,
 	COperatorFunction<float64_t>* operator_log,

diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.h b/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.h
@@ -46,7 +46,11 @@ class CLogDetEstimator : public CSGObject
 	 * 
 	 * @param sparse_mat the input Sparse matrix
 	 */
+	#ifdef HAVE_EIGEN3
+	#ifdef HAVE_LAPACK
 	CLogDetEstimator(SGSparseMatrix<float64_t> sparse_mat);
+	#endif //HAVE_LAPACK
+	#endif //HAVE_EIGEN3
 
 	/**
 	 * constructor

diff --git a/tests/unit/mathematics/linalg/LogDetEstimator_unittest.cc b/tests/unit/mathematics/linalg/LogDetEstimator_unittest.cc
@@ -75,6 +75,7 @@ TEST(LogDetEstimator, sample)
 	SG_UNREF(e);
 }
 
+#ifdef HAVE_LAPACK
 TEST(LogDetEstimator, Sparse_sample_constructor)
 {
 	const index_t size=16;
@@ -105,6 +106,7 @@ TEST(LogDetEstimator, Sparse_sample_constructor)
 	SG_UNREF(op);
 	SG_UNREF(e);
 }
+#endif //HAVE_LAPACK
 #endif // EIGEN_VERSION_AT_LEAST(3,1,0)
 
 TEST(LogDetEstimator, sample_ratapp_dense)