Move a few GPL files to separate gpl folder

shogun-toolbox · Mar 8, 2017 · d649767 · d649767
1 parent 9cbd1a1
commit d649767
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -342,6 +342,7 @@ OPTION(ENABLE_PYTHON_DEBUG "Enable Python-interface-debugging with CTest" OFF)
 OPTION(LICENSE_GPL_SHOGUN "Include GPL codes of Shogun (non-BSD compatible) in build" ON)
 IF (LICENSE_GPL_SHOGUN)
 	SET(USE_GPL_SHOGUN 1)
+	SET(SHOGUN_GPL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/gpl)
 ELSE()
 	SET(USE_GPL_SHOGUN 0)
 ENDIF()

diff --git a/...lticlass/MulticlassLogisticRegression.cpp → ...lticlass/MulticlassLogisticRegression.cpp b/...lticlass/MulticlassLogisticRegression.cpp → ...lticlass/MulticlassLogisticRegression.cpp
@@ -10,7 +10,6 @@
 
 
 #include <shogun/multiclass/MulticlassLogisticRegression.h>
-#ifdef USE_GPL_SHOGUN
 #include <shogun/multiclass/MulticlassOneVsRestStrategy.h>
 #include <shogun/io/SGIO.h>
 #include <shogun/mathematics/Math.h>
@@ -101,4 +100,3 @@ bool CMulticlassLogisticRegression::train_machine(CFeatures* data)
 	}
 	return true;
 }
-#endif //USE_GPL_SHOGUN
diff --git a/...multiclass/MulticlassLogisticRegression.h → ...multiclass/MulticlassLogisticRegression.h b/...multiclass/MulticlassLogisticRegression.h → ...multiclass/MulticlassLogisticRegression.h
@@ -11,7 +11,6 @@
 #ifndef MULTICLASSLOGISTICREGRESSION_H_
 #define MULTICLASSLOGISTICREGRESSION_H_
 #include <shogun/lib/config.h>
-#ifdef USE_GPL_SHOGUN
 #include <shogun/lib/common.h>
 #include <shogun/features/DotFeatures.h>
 #include <shogun/machine/LinearMulticlassMachine.h>
@@ -111,5 +110,4 @@ class CMulticlassLogisticRegression : public CLinearMulticlassMachine
 
 };
 }
-#endif //USE_GPL_SHOGUN
 #endif
diff --git a/src/shogun/optimization/NLOPTMinimizer.cpp → ...pl/shogun/optimization/NLOPTMinimizer.cpp b/src/shogun/optimization/NLOPTMinimizer.cpp → ...pl/shogun/optimization/NLOPTMinimizer.cpp
@@ -35,7 +35,6 @@
 #include <algorithm> 
 
 using namespace shogun;
-#ifdef USE_GPL_SHOGUN
 CNLOPTMinimizer::CNLOPTMinimizer()
 	:FirstOrderMinimizer()
 {
@@ -284,4 +283,3 @@ void CNLOPTMinimizer::init_minimization()
 }
 #endif
 
-#endif //USE_GPL_SHOGUN
diff --git a/src/shogun/optimization/NLOPTMinimizer.h → src/gpl/shogun/optimization/NLOPTMinimizer.h b/src/shogun/optimization/NLOPTMinimizer.h → src/gpl/shogun/optimization/NLOPTMinimizer.h
@@ -34,7 +34,6 @@
 #define CNLOPTMINIMIZER_H
 #include <shogun/optimization/FirstOrderMinimizer.h>
 
-#ifdef USE_GPL_SHOGUN
 #ifdef HAVE_NLOPT
 #include <shogun/optimization/nloptcommon.h>
 #endif 
@@ -136,6 +135,5 @@ class CNLOPTMinimizer: public FirstOrderMinimizer
 };
 
 }
-#endif //USE_GPL_SHOGUN
 #endif /* CNLOPTMINIMIZER_H */
 
diff --git a/src/interfaces/modular/Multiclass.i b/src/interfaces/modular/Multiclass.i
@@ -53,7 +53,9 @@
 %rename(ECOCLLBDecoder) CECOCLLBDecoder;
 
 %rename(MulticlassTreeGuidedLogisticRegression) CMulticlassTreeGuidedLogisticRegression;
+#ifdef USE_GPL_SHOGUN
 %rename(MulticlassLogisticRegression) CMulticlassLogisticRegression;
+#endif //USE_GPL_SHOGUN
 %rename(MulticlassLibLinear) CMulticlassLibLinear;
 %rename(MulticlassOCAS) CMulticlassOCAS;
 %rename(MulticlassSVM) CMulticlassSVM;

diff --git a/src/interfaces/modular/Multiclass_includes.i b/src/interfaces/modular/Multiclass_includes.i
@@ -47,7 +47,9 @@
  #include <shogun/multiclass/ecoc/ECOCLLBDecoder.h>
 
  #include <shogun/multiclass/MulticlassTreeGuidedLogisticRegression.h>
+#ifdef USE_GPL_SHOGUN
  #include <shogun/multiclass/MulticlassLogisticRegression.h>
+#endif //USE_GPL_SHOGUN
  #include <shogun/multiclass/MulticlassLibLinear.h>
  #include <shogun/multiclass/MulticlassOCAS.h>
  #include <shogun/multiclass/MulticlassSVM.h>

diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt
@@ -98,6 +98,11 @@ target_include_directories(shogun PUBLIC
   $<INSTALL_INTERFACE:include/shogun>
 )
 
+get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
+foreach(dir ${dirs})
+  message(STATUS "dir='${dir}'")
+endforeach()
+
 # create shogun_deps meta target to store all the
 # dependencies of shogun itself, this is used in unit test
 add_library(shogun_deps INTERFACE)

diff --git a/tests/unit/classifier/GaussianProcessClassification_unittest.cc b/tests/unit/classifier/GaussianProcessClassification_unittest.cc
@@ -63,7 +63,9 @@
 #include <shogun/machine/gp/SoftMaxLikelihood.h>
 #include <shogun/optimization/lbfgs/LBFGSMinimizer.h>
 
+#ifdef USE_GPL_SHOGUN
 #include <shogun/optimization/NLOPTMinimizer.h>
+#endif
 
 using namespace shogun;