Guarded new L1/L2 logistic regression in for eigen3

shogun-toolbox · Jul 15, 2012 · 7ecdf44 · 7ecdf44
1 parent 629358d
commit 7ecdf44
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/shogun/lib/slep/malsar_joint_feature_learning.cpp b/src/shogun/lib/slep/malsar_joint_feature_learning.cpp
@@ -9,6 +9,7 @@
  */
 
 #include <shogun/lib/slep/malsar_joint_feature_learning.h>
+#ifdef HAVE_EIGEN3
 #include <shogun/mathematics/Math.h>
 #include <iostream>
 
@@ -213,3 +214,4 @@ slep_result_t malsar_joint_feature_learning(
 	return slep_result_t(tasks_w, tasks_c);
 };
 };
+#endif
diff --git a/src/shogun/lib/slep/malsar_joint_feature_learning.h b/src/shogun/lib/slep/malsar_joint_feature_learning.h
@@ -10,6 +10,8 @@
 
 #ifndef  MALSAR_JOINT_FEATURE_LEARNING_H_
 #define  MALSAR_JOINT_FEATURE_LEARNING_H_
+#include <shogun/lib/config.h>
+#ifdef HAVE_EIGEN3
 #include <shogun/lib/slep/slep_options.h>
 #include <shogun/features/DotFeatures.h>
 
@@ -24,5 +26,6 @@ slep_result_t malsar_joint_feature_learning(
 		const slep_options& options);
 
 };
+#endif
 #endif   /* ----- #ifndef MALSAR_JOINT_FEATURE_LEARNING_H_  ----- */
 
diff --git a/src/shogun/transfer/multitask/MultitaskL1L2LogisticRegression.cpp b/src/shogun/transfer/multitask/MultitaskL1L2LogisticRegression.cpp
@@ -64,8 +64,10 @@ bool CMultitaskL1L2LogisticRegression::train_machine(CFeatures* data)
 	options.ind = ind.vector;
 	options.n_tasks = ind.vlen-1;
 
+#ifdef HAVE_EIGEN3
 	slep_result_t model = malsar_joint_feature_learning(
 		features, y.vector, m_rho1, m_rho2, options);
+#endif
 
 	m_tasks_w = model.w;
 	m_tasks_c = model.c;