move USE_GPL_SHOGUN guarded files to gpl folder

-proper guarding in SWIG interface definitions
shogun-toolbox · Jul 5, 2017 · 846d0dd · 846d0dd
1 parent 00ec38a
commit 846d0dd
Show file tree

Hide file tree

Showing 108 changed files with 44 additions and 14 deletions.
diff --git a/src/gpl/shogun/classifier/svm/SVMOcas.h b/src/gpl/shogun/classifier/svm/SVMOcas.h
@@ -14,7 +14,6 @@
 #define _SVMOCAS_H___
 
 #include <shogun/lib/config.h>
-#ifdef USE_GPL_SHOGUN
 
 #include <shogun/lib/common.h>
 #include <shogun/machine/LinearMachine.h>
@@ -238,5 +237,3 @@ class CSVMOcas : public CLinearMachine
 };
 }
 #endif
-
-#endif //USE_GPL_SHOGUN
diff --git a/src/shogun/latent/LatentSOSVM.cpp → src/gpl/shogun/latent/LatentSOSVM.cpp b/src/shogun/latent/LatentSOSVM.cpp → src/gpl/shogun/latent/LatentSOSVM.cpp
diff --git a/src/shogun/latent/LatentSOSVM.h → src/gpl/shogun/latent/LatentSOSVM.h b/src/shogun/latent/LatentSOSVM.h → src/gpl/shogun/latent/LatentSOSVM.h
diff --git a/src/shogun/latent/LatentSVM.cpp → src/gpl/shogun/latent/LatentSVM.cpp b/src/shogun/latent/LatentSVM.cpp → src/gpl/shogun/latent/LatentSVM.cpp
diff --git a/src/shogun/latent/LatentSVM.h → src/gpl/shogun/latent/LatentSVM.h b/src/shogun/latent/LatentSVM.h → src/gpl/shogun/latent/LatentSVM.h
diff --git a/src/shogun/lib/external/gpdt.cpp → src/gpl/shogun/lib/external/gpdt.cpp b/src/shogun/lib/external/gpdt.cpp → src/gpl/shogun/lib/external/gpdt.cpp
diff --git a/src/shogun/lib/external/gpdt.h → src/gpl/shogun/lib/external/gpdt.h b/src/shogun/lib/external/gpdt.h → src/gpl/shogun/lib/external/gpdt.h
diff --git a/src/shogun/lib/external/gpdtsolve.cpp → src/gpl/shogun/lib/external/gpdtsolve.cpp b/src/shogun/lib/external/gpdtsolve.cpp → src/gpl/shogun/lib/external/gpdtsolve.cpp
diff --git a/src/shogun/lib/external/gpdtsolve.h → src/gpl/shogun/lib/external/gpdtsolve.h b/src/shogun/lib/external/gpdtsolve.h → src/gpl/shogun/lib/external/gpdtsolve.h
diff --git a/src/shogun/lib/external/gpm.cpp → src/gpl/shogun/lib/external/gpm.cpp b/src/shogun/lib/external/gpm.cpp → src/gpl/shogun/lib/external/gpm.cpp
diff --git a/src/shogun/lib/external/gpm.h → src/gpl/shogun/lib/external/gpm.h b/src/shogun/lib/external/gpm.h → src/gpl/shogun/lib/external/gpm.h
diff --git a/src/shogun/lib/external/libocas.cpp → src/gpl/shogun/lib/external/libocas.cpp b/src/shogun/lib/external/libocas.cpp → src/gpl/shogun/lib/external/libocas.cpp
diff --git a/src/shogun/lib/external/libocas.h → src/gpl/shogun/lib/external/libocas.h b/src/shogun/lib/external/libocas.h → src/gpl/shogun/lib/external/libocas.h
diff --git a/src/shogun/lib/external/libocas_common.h → src/gpl/shogun/lib/external/libocas_common.h b/src/shogun/lib/external/libocas_common.h → src/gpl/shogun/lib/external/libocas_common.h
diff --git a/src/shogun/lib/external/libqp.h → src/gpl/shogun/lib/external/libqp.h b/src/shogun/lib/external/libqp.h → src/gpl/shogun/lib/external/libqp.h
diff --git a/src/shogun/lib/external/libqp_gsmo.cpp → src/gpl/shogun/lib/external/libqp_gsmo.cpp b/src/shogun/lib/external/libqp_gsmo.cpp → src/gpl/shogun/lib/external/libqp_gsmo.cpp
diff --git a/src/shogun/lib/external/libqp_splx.cpp → src/gpl/shogun/lib/external/libqp_splx.cpp b/src/shogun/lib/external/libqp_splx.cpp → src/gpl/shogun/lib/external/libqp_splx.cpp
diff --git a/src/shogun/lib/external/pr_loqo.cpp → src/gpl/shogun/lib/external/pr_loqo.cpp b/src/shogun/lib/external/pr_loqo.cpp → src/gpl/shogun/lib/external/pr_loqo.cpp
diff --git a/src/shogun/lib/external/pr_loqo.h → src/gpl/shogun/lib/external/pr_loqo.h b/src/shogun/lib/external/pr_loqo.h → src/gpl/shogun/lib/external/pr_loqo.h
diff --git a/src/shogun/lib/malsar/malsar_clustered.cpp → ...pl/shogun/lib/malsar/malsar_clustered.cpp b/src/shogun/lib/malsar/malsar_clustered.cpp → ...pl/shogun/lib/malsar/malsar_clustered.cpp
diff --git a/src/shogun/lib/malsar/malsar_clustered.h → src/gpl/shogun/lib/malsar/malsar_clustered.h b/src/shogun/lib/malsar/malsar_clustered.h → src/gpl/shogun/lib/malsar/malsar_clustered.h
diff --git a/.../malsar/malsar_joint_feature_learning.cpp → .../malsar/malsar_joint_feature_learning.cpp b/.../malsar/malsar_joint_feature_learning.cpp → .../malsar/malsar_joint_feature_learning.cpp
diff --git a/...ib/malsar/malsar_joint_feature_learning.h → ...ib/malsar/malsar_joint_feature_learning.h b/...ib/malsar/malsar_joint_feature_learning.h → ...ib/malsar/malsar_joint_feature_learning.h
diff --git a/src/shogun/lib/malsar/malsar_low_rank.cpp → ...gpl/shogun/lib/malsar/malsar_low_rank.cpp b/src/shogun/lib/malsar/malsar_low_rank.cpp → ...gpl/shogun/lib/malsar/malsar_low_rank.cpp
diff --git a/src/shogun/lib/malsar/malsar_low_rank.h → src/gpl/shogun/lib/malsar/malsar_low_rank.h b/src/shogun/lib/malsar/malsar_low_rank.h → src/gpl/shogun/lib/malsar/malsar_low_rank.h
diff --git a/src/shogun/lib/malsar/malsar_options.h → src/gpl/shogun/lib/malsar/malsar_options.h b/src/shogun/lib/malsar/malsar_options.h → src/gpl/shogun/lib/malsar/malsar_options.h
diff --git a/src/shogun/lib/slep/SpInvCoVa/invCov.cpp → src/gpl/shogun/lib/slep/SpInvCoVa/invCov.cpp b/src/shogun/lib/slep/SpInvCoVa/invCov.cpp → src/gpl/shogun/lib/slep/SpInvCoVa/invCov.cpp
diff --git a/src/shogun/lib/slep/SpInvCoVa/invCov.h → src/gpl/shogun/lib/slep/SpInvCoVa/invCov.h b/src/shogun/lib/slep/SpInvCoVa/invCov.h → src/gpl/shogun/lib/slep/SpInvCoVa/invCov.h
diff --git a/src/shogun/lib/slep/flsa/flsa.cpp → src/gpl/shogun/lib/slep/flsa/flsa.cpp b/src/shogun/lib/slep/flsa/flsa.cpp → src/gpl/shogun/lib/slep/flsa/flsa.cpp
diff --git a/src/shogun/lib/slep/flsa/flsa.h → src/gpl/shogun/lib/slep/flsa/flsa.h b/src/shogun/lib/slep/flsa/flsa.h → src/gpl/shogun/lib/slep/flsa/flsa.h
diff --git a/src/shogun/lib/slep/flsa/sfa.cpp → src/gpl/shogun/lib/slep/flsa/sfa.cpp b/src/shogun/lib/slep/flsa/sfa.cpp → src/gpl/shogun/lib/slep/flsa/sfa.cpp
diff --git a/src/shogun/lib/slep/flsa/sfa.h → src/gpl/shogun/lib/slep/flsa/sfa.h b/src/shogun/lib/slep/flsa/sfa.h → src/gpl/shogun/lib/slep/flsa/sfa.h
diff --git a/src/shogun/lib/slep/flsa/tesla_proj.cpp → src/gpl/shogun/lib/slep/flsa/tesla_proj.cpp b/src/shogun/lib/slep/flsa/tesla_proj.cpp → src/gpl/shogun/lib/slep/flsa/tesla_proj.cpp
diff --git a/src/shogun/lib/slep/order/orderTree.h → src/gpl/shogun/lib/slep/order/orderTree.h b/src/shogun/lib/slep/order/orderTree.h → src/gpl/shogun/lib/slep/order/orderTree.h
diff --git a/src/shogun/lib/slep/order/sequence.h → src/gpl/shogun/lib/slep/order/sequence.h b/src/shogun/lib/slep/order/sequence.h → src/gpl/shogun/lib/slep/order/sequence.h
diff --git a/...ogun/lib/slep/overlapping/overlapping.cpp → ...ogun/lib/slep/overlapping/overlapping.cpp b/...ogun/lib/slep/overlapping/overlapping.cpp → ...ogun/lib/slep/overlapping/overlapping.cpp
diff --git a/...shogun/lib/slep/overlapping/overlapping.h → ...shogun/lib/slep/overlapping/overlapping.h b/...shogun/lib/slep/overlapping/overlapping.h → ...shogun/lib/slep/overlapping/overlapping.h
diff --git a/src/shogun/lib/slep/q1/ep1R.h → src/gpl/shogun/lib/slep/q1/ep1R.h b/src/shogun/lib/slep/q1/ep1R.h → src/gpl/shogun/lib/slep/q1/ep1R.h
diff --git a/src/shogun/lib/slep/q1/ep21R.h → src/gpl/shogun/lib/slep/q1/ep21R.h b/src/shogun/lib/slep/q1/ep21R.h → src/gpl/shogun/lib/slep/q1/ep21R.h
diff --git a/src/shogun/lib/slep/q1/ep21d.h → src/gpl/shogun/lib/slep/q1/ep21d.h b/src/shogun/lib/slep/q1/ep21d.h → src/gpl/shogun/lib/slep/q1/ep21d.h
diff --git a/src/shogun/lib/slep/q1/eppMatrix.cpp → src/gpl/shogun/lib/slep/q1/eppMatrix.cpp b/src/shogun/lib/slep/q1/eppMatrix.cpp → src/gpl/shogun/lib/slep/q1/eppMatrix.cpp
diff --git a/src/shogun/lib/slep/q1/eppMatrix.h → src/gpl/shogun/lib/slep/q1/eppMatrix.h b/src/shogun/lib/slep/q1/eppMatrix.h → src/gpl/shogun/lib/slep/q1/eppMatrix.h
diff --git a/src/shogun/lib/slep/q1/eppVector.h → src/gpl/shogun/lib/slep/q1/eppVector.h b/src/shogun/lib/slep/q1/eppVector.h → src/gpl/shogun/lib/slep/q1/eppVector.h
diff --git a/src/shogun/lib/slep/q1/eppVectorR.h → src/gpl/shogun/lib/slep/q1/eppVectorR.h b/src/shogun/lib/slep/q1/eppVectorR.h → src/gpl/shogun/lib/slep/q1/eppVectorR.h
diff --git a/src/shogun/lib/slep/q1/epph.cpp → src/gpl/shogun/lib/slep/q1/epph.cpp b/src/shogun/lib/slep/q1/epph.cpp → src/gpl/shogun/lib/slep/q1/epph.cpp
diff --git a/src/shogun/lib/slep/q1/epph.h → src/gpl/shogun/lib/slep/q1/epph.h b/src/shogun/lib/slep/q1/epph.h → src/gpl/shogun/lib/slep/q1/epph.h
diff --git a/src/shogun/lib/slep/q1/epsgLasso.h → src/gpl/shogun/lib/slep/q1/epsgLasso.h b/src/shogun/lib/slep/q1/epsgLasso.h → src/gpl/shogun/lib/slep/q1/epsgLasso.h
diff --git a/src/shogun/lib/slep/q1/epsp.h → src/gpl/shogun/lib/slep/q1/epsp.h b/src/shogun/lib/slep/q1/epsp.h → src/gpl/shogun/lib/slep/q1/epsp.h
diff --git a/src/shogun/lib/slep/slep_mc_plain_lr.cpp → src/gpl/shogun/lib/slep/slep_mc_plain_lr.cpp b/src/shogun/lib/slep/slep_mc_plain_lr.cpp → src/gpl/shogun/lib/slep/slep_mc_plain_lr.cpp
diff --git a/src/shogun/lib/slep/slep_mc_plain_lr.h → src/gpl/shogun/lib/slep/slep_mc_plain_lr.h b/src/shogun/lib/slep/slep_mc_plain_lr.h → src/gpl/shogun/lib/slep/slep_mc_plain_lr.h
diff --git a/src/shogun/lib/slep/slep_mc_tree_lr.cpp → src/gpl/shogun/lib/slep/slep_mc_tree_lr.cpp b/src/shogun/lib/slep/slep_mc_tree_lr.cpp → src/gpl/shogun/lib/slep/slep_mc_tree_lr.cpp
diff --git a/src/shogun/lib/slep/slep_mc_tree_lr.h → src/gpl/shogun/lib/slep/slep_mc_tree_lr.h b/src/shogun/lib/slep/slep_mc_tree_lr.h → src/gpl/shogun/lib/slep/slep_mc_tree_lr.h
diff --git a/src/shogun/lib/slep/slep_options.h → src/gpl/shogun/lib/slep/slep_options.h b/src/shogun/lib/slep/slep_options.h → src/gpl/shogun/lib/slep/slep_options.h
diff --git a/src/shogun/lib/slep/slep_solver.cpp → src/gpl/shogun/lib/slep/slep_solver.cpp b/src/shogun/lib/slep/slep_solver.cpp → src/gpl/shogun/lib/slep/slep_solver.cpp
diff --git a/src/shogun/lib/slep/slep_solver.h → src/gpl/shogun/lib/slep/slep_solver.h b/src/shogun/lib/slep/slep_solver.h → src/gpl/shogun/lib/slep/slep_solver.h
diff --git a/src/shogun/lib/slep/tree/altra.cpp → src/gpl/shogun/lib/slep/tree/altra.cpp b/src/shogun/lib/slep/tree/altra.cpp → src/gpl/shogun/lib/slep/tree/altra.cpp
diff --git a/src/shogun/lib/slep/tree/altra.h → src/gpl/shogun/lib/slep/tree/altra.h b/src/shogun/lib/slep/tree/altra.h → src/gpl/shogun/lib/slep/tree/altra.h
diff --git a/src/shogun/lib/slep/tree/general_altra.cpp → ...pl/shogun/lib/slep/tree/general_altra.cpp b/src/shogun/lib/slep/tree/general_altra.cpp → ...pl/shogun/lib/slep/tree/general_altra.cpp
diff --git a/src/shogun/lib/slep/tree/general_altra.h → src/gpl/shogun/lib/slep/tree/general_altra.h b/src/shogun/lib/slep/tree/general_altra.h → src/gpl/shogun/lib/slep/tree/general_altra.h
diff --git a/...shogun/lib/tapkee/neighbors/covertree.hpp → ...shogun/lib/tapkee/neighbors/covertree.hpp b/...shogun/lib/tapkee/neighbors/covertree.hpp → ...shogun/lib/tapkee/neighbors/covertree.hpp
diff --git a/.../lib/tapkee/neighbors/covertree_point.hpp → .../lib/tapkee/neighbors/covertree_point.hpp b/.../lib/tapkee/neighbors/covertree_point.hpp → .../lib/tapkee/neighbors/covertree_point.hpp
diff --git a/...n/mathematics/SparseInverseCovariance.cpp → ...n/mathematics/SparseInverseCovariance.cpp b/...n/mathematics/SparseInverseCovariance.cpp → ...n/mathematics/SparseInverseCovariance.cpp
diff --git a/...gun/mathematics/SparseInverseCovariance.h → ...gun/mathematics/SparseInverseCovariance.h b/...gun/mathematics/SparseInverseCovariance.h → ...gun/mathematics/SparseInverseCovariance.h
diff --git a/src/shogun/multiclass/MulticlassOCAS.cpp → src/gpl/shogun/multiclass/MulticlassOCAS.cpp b/src/shogun/multiclass/MulticlassOCAS.cpp → src/gpl/shogun/multiclass/MulticlassOCAS.cpp
diff --git a/src/shogun/multiclass/MulticlassOCAS.h → src/gpl/shogun/multiclass/MulticlassOCAS.h b/src/shogun/multiclass/MulticlassOCAS.h → src/gpl/shogun/multiclass/MulticlassOCAS.h
diff --git a/src/shogun/optimization/nloptcommon.h → src/gpl/shogun/optimization/nloptcommon.h b/src/shogun/optimization/nloptcommon.h → src/gpl/shogun/optimization/nloptcommon.h
diff --git a/...election/internals/OptimizationSolver.cpp → ...election/internals/OptimizationSolver.cpp b/...election/internals/OptimizationSolver.cpp → ...election/internals/OptimizationSolver.cpp
diff --git a/...lselection/internals/OptimizationSolver.h → ...lselection/internals/OptimizationSolver.h b/...lselection/internals/OptimizationSolver.h → ...lselection/internals/OptimizationSolver.h
diff --git a/...election/internals/WeightedMaxMeasure.cpp → ...election/internals/WeightedMaxMeasure.cpp b/...election/internals/WeightedMaxMeasure.cpp → ...election/internals/WeightedMaxMeasure.cpp
diff --git a/...lselection/internals/WeightedMaxMeasure.h → ...lselection/internals/WeightedMaxMeasure.h b/...lselection/internals/WeightedMaxMeasure.h → ...lselection/internals/WeightedMaxMeasure.h
diff --git a/...ection/internals/WeightedMaxTestPower.cpp → ...ection/internals/WeightedMaxTestPower.cpp b/...ection/internals/WeightedMaxTestPower.cpp → ...ection/internals/WeightedMaxTestPower.cpp
diff --git a/...election/internals/WeightedMaxTestPower.h → ...election/internals/WeightedMaxTestPower.h b/...election/internals/WeightedMaxTestPower.h → ...election/internals/WeightedMaxTestPower.h
diff --git a/src/shogun/structure/BmrmStatistics.h → src/gpl/shogun/structure/BmrmStatistics.h b/src/shogun/structure/BmrmStatistics.h → src/gpl/shogun/structure/BmrmStatistics.h
diff --git a/src/shogun/structure/DualLibQPBMSOSVM.cpp → ...gpl/shogun/structure/DualLibQPBMSOSVM.cpp b/src/shogun/structure/DualLibQPBMSOSVM.cpp → ...gpl/shogun/structure/DualLibQPBMSOSVM.cpp
diff --git a/src/shogun/structure/DualLibQPBMSOSVM.h → src/gpl/shogun/structure/DualLibQPBMSOSVM.h b/src/shogun/structure/DualLibQPBMSOSVM.h → src/gpl/shogun/structure/DualLibQPBMSOSVM.h
diff --git a/src/shogun/structure/libbmrm.cpp → src/gpl/shogun/structure/libbmrm.cpp b/src/shogun/structure/libbmrm.cpp → src/gpl/shogun/structure/libbmrm.cpp
diff --git a/src/shogun/structure/libbmrm.h → src/gpl/shogun/structure/libbmrm.h b/src/shogun/structure/libbmrm.h → src/gpl/shogun/structure/libbmrm.h
diff --git a/src/shogun/structure/libncbm.cpp → src/gpl/shogun/structure/libncbm.cpp b/src/shogun/structure/libncbm.cpp → src/gpl/shogun/structure/libncbm.cpp
diff --git a/src/shogun/structure/libncbm.h → src/gpl/shogun/structure/libncbm.h b/src/shogun/structure/libncbm.h → src/gpl/shogun/structure/libncbm.h
diff --git a/src/shogun/structure/libp3bm.cpp → src/gpl/shogun/structure/libp3bm.cpp b/src/shogun/structure/libp3bm.cpp → src/gpl/shogun/structure/libp3bm.cpp
diff --git a/src/shogun/structure/libp3bm.h → src/gpl/shogun/structure/libp3bm.h b/src/shogun/structure/libp3bm.h → src/gpl/shogun/structure/libp3bm.h
diff --git a/src/shogun/structure/libppbm.cpp → src/gpl/shogun/structure/libppbm.cpp b/src/shogun/structure/libppbm.cpp → src/gpl/shogun/structure/libppbm.cpp
diff --git a/src/shogun/structure/libppbm.h → src/gpl/shogun/structure/libppbm.h b/src/shogun/structure/libppbm.h → src/gpl/shogun/structure/libppbm.h
diff --git a/...titask/MultitaskL12LogisticRegression.cpp → ...titask/MultitaskL12LogisticRegression.cpp b/...titask/MultitaskL12LogisticRegression.cpp → ...titask/MultitaskL12LogisticRegression.cpp
diff --git a/...ultitask/MultitaskL12LogisticRegression.h → ...ultitask/MultitaskL12LogisticRegression.h b/...ultitask/MultitaskL12LogisticRegression.h → ...ultitask/MultitaskL12LogisticRegression.h
diff --git a/...itask/MultitaskLeastSquaresRegression.cpp → ...itask/MultitaskLeastSquaresRegression.cpp b/...itask/MultitaskLeastSquaresRegression.cpp → ...itask/MultitaskLeastSquaresRegression.cpp
diff --git a/...ltitask/MultitaskLeastSquaresRegression.h → ...ltitask/MultitaskLeastSquaresRegression.h b/...ltitask/MultitaskLeastSquaresRegression.h → ...ltitask/MultitaskLeastSquaresRegression.h
diff --git a/...sfer/multitask/MultitaskLinearMachine.cpp → ...sfer/multitask/MultitaskLinearMachine.cpp b/...sfer/multitask/MultitaskLinearMachine.cpp → ...sfer/multitask/MultitaskLinearMachine.cpp
diff --git a/...ansfer/multitask/MultitaskLinearMachine.h → ...ansfer/multitask/MultitaskLinearMachine.h b/...ansfer/multitask/MultitaskLinearMachine.h → ...ansfer/multitask/MultitaskLinearMachine.h
diff --git a/...multitask/MultitaskLogisticRegression.cpp → ...multitask/MultitaskLogisticRegression.cpp b/...multitask/MultitaskLogisticRegression.cpp → ...multitask/MultitaskLogisticRegression.cpp
diff --git a/...r/multitask/MultitaskLogisticRegression.h → ...r/multitask/MultitaskLogisticRegression.h b/...r/multitask/MultitaskLogisticRegression.h → ...r/multitask/MultitaskLogisticRegression.h
diff --git a/...task/MultitaskTraceLogisticRegression.cpp → ...task/MultitaskTraceLogisticRegression.cpp b/...task/MultitaskTraceLogisticRegression.cpp → ...task/MultitaskTraceLogisticRegression.cpp
diff --git a/...titask/MultitaskTraceLogisticRegression.h → ...titask/MultitaskTraceLogisticRegression.h b/...titask/MultitaskTraceLogisticRegression.h → ...titask/MultitaskTraceLogisticRegression.h
diff --git a/src/interfaces/swig/Classifier.i b/src/interfaces/swig/Classifier.i
@@ -67,7 +67,9 @@
 %rename(MKLClassification) CMKLClassification;
 %rename(MKLOneClass) CMKLOneClass;
 %rename(VowpalWabbit) CVowpalWabbit;
+#ifdef USE_GPL_SHOGUN
 %rename(FeatureBlockLogisticRegression) CFeatureBlockLogisticRegression;
+#endif //USE_GPL_SHOGUN
 %rename(DirectorLinearMachine) CDirectorLinearMachine;
 %rename(DirectorKernelMachine) CDirectorKernelMachine;
 %rename(BaggingMachine) CBaggingMachine;
@@ -130,7 +132,9 @@
 %include <shogun/classifier/mkl/MKLOneClass.h>
 %include <shogun/classifier/vw/VowpalWabbit.h>
 %include <shogun/classifier/svm/NewtonSVM.h>
+#ifdef USE_GPL_SHOGUN
 %include <shogun/classifier/FeatureBlockLogisticRegression.h>
+#endif //USE_GPL_SHOGUN
 %include <shogun/machine/DirectorLinearMachine.h>
 %include <shogun/machine/DirectorKernelMachine.h>
 %include <shogun/machine/BaggingMachine.h>
diff --git a/src/interfaces/swig/Classifier_includes.i b/src/interfaces/swig/Classifier_includes.i
@@ -1,3 +1,4 @@
+
 %{
  #include <shogun/machine/Machine.h>
  #include <shogun/classifier/svm/GNPPSVM.h>
@@ -39,7 +40,9 @@
  #include <shogun/classifier/mkl/MKLOneClass.h>
  #include <shogun/classifier/vw/VowpalWabbit.h>
  #include <shogun/classifier/svm/NewtonSVM.h>
+#ifdef USE_GPL_SHOGUN
  #include <shogun/classifier/FeatureBlockLogisticRegression.h>
+#endif //USE_GPL_SHOGUN
  #include <shogun/machine/DirectorLinearMachine.h>
  #include <shogun/machine/DirectorKernelMachine.h>
  #include <shogun/machine/BaggingMachine.h>

diff --git a/src/interfaces/swig/Latent.i b/src/interfaces/swig/Latent.i
@@ -29,4 +29,6 @@
 
 %include <shogun/machine/LinearLatentMachine.h>
 
+#ifdef USE_GPL_SHOGUN
 %include <shogun/latent/LatentSVM.h>
+#endif //USE_GPL_SHOGUN
diff --git a/src/interfaces/swig/Latent_includes.i b/src/interfaces/swig/Latent_includes.i
@@ -5,6 +5,8 @@
 
  #include <shogun/machine/LinearLatentMachine.h>
 
+#ifdef USE_GPL_SHOGUN
  #include <shogun/latent/LatentSVM.h>
+#endif USE_GPL_SHOGUN
 %}
 
diff --git a/src/interfaces/swig/Mathematics.i b/src/interfaces/swig/Mathematics.i
@@ -12,7 +12,9 @@
 /* Remove C Prefix */
 %rename(Math) CMath;
 %rename(Statistics) CStatistics;
+#ifdef USE_GPL_SHOGUN
 %rename(SparseInverseCovariance) CSparseInverseCovariance;
+#endif //USE_GPL_SHOGUN
 
 // fix overloaded methods in Math
 #if defined(SWIGLUA) || defined(SWIGR)
@@ -194,7 +196,9 @@ namespace shogun
 /* Include Class Headers to make them visible from within the target language */
 %include <shogun/mathematics/Math.h>
 %include <shogun/mathematics/Statistics.h>
+#ifdef USE_GPL_SHOGUN
 %include <shogun/mathematics/SparseInverseCovariance.h>
+#endif //USE_GPL_SHOGUN
 
 /* Log-det framework */
 %include <shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h>

diff --git a/src/interfaces/swig/Mathematics_includes.i b/src/interfaces/swig/Mathematics_includes.i
@@ -1,7 +1,9 @@
 %{
 #include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/Statistics.h>
+#ifdef USE_GPL_SHOGUN
 #include <shogun/mathematics/SparseInverseCovariance.h>
+#endif //USE_GPL_SHOGUN
 
 /* Log-det framework */
 #include <shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h>

diff --git a/src/interfaces/swig/Multiclass.i b/src/interfaces/swig/Multiclass.i
@@ -55,9 +55,9 @@
 #ifdef USE_GPL_SHOGUN
 %rename(MulticlassTreeGuidedLogisticRegression) CMulticlassTreeGuidedLogisticRegression;
 %rename(MulticlassLogisticRegression) CMulticlassLogisticRegression;
+%rename(MulticlassOCAS) CMulticlassOCAS;
 #endif //USE_GPL_SHOGUN
 %rename(MulticlassLibLinear) CMulticlassLibLinear;
-%rename(MulticlassOCAS) CMulticlassOCAS;
 %rename(MulticlassSVM) CMulticlassSVM;
 %rename(MulticlassLibSVM) CMulticlassLibSVM;
 %rename(LaRank) CLaRank;
@@ -126,9 +126,9 @@ namespace shogun
 #ifdef USE_GPL_SHOGUN
 %include <shogun/multiclass/MulticlassTreeGuidedLogisticRegression.h>
 %include <shogun/multiclass/MulticlassLogisticRegression.h>
+%include <shogun/multiclass/MulticlassOCAS.h>
 #endif // USE_GPL_SHOGUN
 %include <shogun/multiclass/MulticlassLibLinear.h>
-%include <shogun/multiclass/MulticlassOCAS.h>
 %include <shogun/multiclass/MulticlassSVM.h>
 %include <shogun/multiclass/MulticlassLibSVM.h>
 %include <shogun/multiclass/LaRank.h>

diff --git a/src/interfaces/swig/Multiclass_includes.i b/src/interfaces/swig/Multiclass_includes.i
@@ -49,9 +49,9 @@
 #ifdef USE_GPL_SHOGUN
  #include <shogun/multiclass/MulticlassTreeGuidedLogisticRegression.h>
  #include <shogun/multiclass/MulticlassLogisticRegression.h>
+ #include <shogun/multiclass/MulticlassOCAS.h>
 #endif //USE_GPL_SHOGUN
  #include <shogun/multiclass/MulticlassLibLinear.h>
- #include <shogun/multiclass/MulticlassOCAS.h>
  #include <shogun/multiclass/MulticlassSVM.h>
  #include <shogun/multiclass/LaRank.h>
  #include <shogun/multiclass/MulticlassLibSVM.h>

diff --git a/src/interfaces/swig/Structure.i b/src/interfaces/swig/Structure.i
@@ -56,11 +56,13 @@
 %rename(StructuredOutputMachine) CStructuredOutputMachine;
 %rename(LinearStructuredOutputMachine) CLinearStructuredOutputMachine;
 %rename(KernelStructuredOutputMachine) CKernelStructuredOutputMachine;
-%rename(DualLibQPBMSOSVM) CDualLibQPBMSOSVM;
 
+#ifdef USE_GPL_SHOGUN
+%rename(DualLibQPBMSOSVM) CDualLibQPBMSOSVM;
 #ifdef USE_MOSEK
 %rename(PrimalMosekSOSVM) CPrimalMosekSOSVM;
 #endif /* USE_MOSEK */
+#endif //USE_GPL_SHOGUN
 
 %rename(StochasticSOSVM) CStochasticSOSVM;
 %rename(FWSOSVM) CFWSOSVM;
@@ -74,7 +76,9 @@
 %include <shogun/structure/IntronList.h>
 %include <shogun/structure/SegmentLoss.h>
 
+#ifdef USE_GPL_SHOGUN
 %include <shogun/structure/BmrmStatistics.h>
+#endif //USE_GPL_SHOGUN
 %include <shogun/structure/StructuredModel.h>
 %include <shogun/structure/MulticlassModel.h>
 %include <shogun/structure/MulticlassSOLabels.h>
@@ -105,11 +109,13 @@
 %include <shogun/machine/LinearStructuredOutputMachine.h>
 %include <shogun/machine/KernelStructuredOutputMachine.h>
 
+#ifdef USE_GPL_SHOGUN
 %include <shogun/structure/DualLibQPBMSOSVM.h>
 
 #ifdef USE_MOSEK
 %include <shogun/structure/PrimalMosekSOSVM.h>
 #endif /* USE_MOSEK */
+#endif //USE_GPL_SHOGUN
 
 %include <shogun/structure/StochasticSOSVM.h>
 %include <shogun/structure/FWSOSVM.h>
diff --git a/src/interfaces/swig/Structure_includes.i b/src/interfaces/swig/Structure_includes.i
@@ -6,8 +6,10 @@
  #include <shogun/structure/PlifMatrix.h>
  #include <shogun/structure/IntronList.h>
  #include <shogun/structure/SegmentLoss.h>
-
+
+#ifdef USE_GPL_SHOGUN
  #include <shogun/structure/BmrmStatistics.h>
+#endif //USE_GPL_SHOGUN
  #include <shogun/structure/StructuredModel.h>
  #include <shogun/structure/MulticlassModel.h>
  #include <shogun/structure/MulticlassSOLabels.h>
@@ -38,11 +40,12 @@
  #include <shogun/machine/LinearStructuredOutputMachine.h>
  #include <shogun/machine/KernelStructuredOutputMachine.h>
 
- #include <shogun/structure/DualLibQPBMSOSVM.h>
-
+#ifdef USE_GPL_SHOGUN
+#include <shogun/structure/DualLibQPBMSOSVM.h>
 #ifdef USE_MOSEK
  #include <shogun/structure/PrimalMosekSOSVM.h>
 #endif /* USE_MOSEK */
+#endif //USE_GPL_SHOGUN
 
  #include <shogun/structure/StochasticSOSVM.h>
  #include <shogun/structure/FWSOSVM.h>

diff --git a/src/interfaces/swig/Transfer.i b/src/interfaces/swig/Transfer.i
@@ -20,12 +20,14 @@
 %rename(TaskRelationBase) CTaskRelation;
 %rename(TaskTree) CTaskTree;
 %rename(TaskGroup) CTaskGroup;
+#ifdef USE_GPL_SHOGUN
 %rename(MultitaskLinearMachineBase) CMultitaskLinearMachine;
 %rename(MultitaskLeastSquaresRegression) CMultitaskLeastSquaresRegression;
 %rename(MultitaskLogisticRegression) CMultitaskLogisticRegression;
 %rename(MultitaskL12LogisticRegression) CMultitaskL12LogisticRegression;
 %rename(MultitaskTraceLogisticRegression) CMultitaskTraceLogisticRegression;
 %rename(MultitaskClusteredLogisticRegression) CMultitaskClusteredLogisticRegression;
+#endif //USE_GPL_SHOGUN
 
 %rename(MultitaskROCEvaluation) CMultitaskROCEvaluation;
 
@@ -50,11 +52,13 @@
 %include <shogun/transfer/multitask/TaskRelation.h>
 %include <shogun/transfer/multitask/TaskTree.h>
 %include <shogun/transfer/multitask/TaskGroup.h>
+#ifdef USE_GPL_SHOGUN
 %include <shogun/transfer/multitask/MultitaskLinearMachine.h>
 %include <shogun/transfer/multitask/MultitaskLeastSquaresRegression.h>
 %include <shogun/transfer/multitask/MultitaskLogisticRegression.h>
 %include <shogun/transfer/multitask/MultitaskL12LogisticRegression.h>
 %include <shogun/transfer/multitask/MultitaskTraceLogisticRegression.h>
+#endif //USE_GPL_SHOGUN
 
 %include <shogun/transfer/multitask/MultitaskROCEvaluation.h>
 %include <shogun/transfer/multitask/LibLinearMTL.h>

diff --git a/src/interfaces/swig/Transfer_includes.i b/src/interfaces/swig/Transfer_includes.i
@@ -11,11 +11,13 @@
  #include <shogun/transfer/multitask/TaskRelation.h>
  #include <shogun/transfer/multitask/TaskTree.h>
  #include <shogun/transfer/multitask/TaskGroup.h>
+#ifdef USE_GPL_SHOGUN
  #include <shogun/transfer/multitask/MultitaskLinearMachine.h>
  #include <shogun/transfer/multitask/MultitaskLeastSquaresRegression.h>
  #include <shogun/transfer/multitask/MultitaskLogisticRegression.h>
  #include <shogun/transfer/multitask/MultitaskL12LogisticRegression.h>
  #include <shogun/transfer/multitask/MultitaskTraceLogisticRegression.h>
+#endif //USE_GPL_SHOGUN
 
  #include <shogun/transfer/multitask/MultitaskROCEvaluation.h>
 

diff --git a/tests/unit/classifier/svm/SVMOcas_unittest.cc b/tests/unit/classifier/svm/SVMOcas_unittest.cc
@@ -1,4 +1,7 @@
+#include <shogun/lib/config.h>
+#ifdef USE_GPL_SHOGUN
 #include <shogun/classifier/svm/SVMOcas.h>
+#endif // USE_GPL_SHOGUN
 #include <shogun/evaluation/ContingencyTableEvaluation.h>
 #include <shogun/features/DataGenerator.h>
 #include <shogun/features/DenseFeatures.h>

diff --git a/tests/unit/latent/LatentSVM_unittest.cc b/tests/unit/latent/LatentSVM_unittest.cc
@@ -1,8 +1,8 @@
 #include "MockLatentModel.h"
 #include <shogun/lib/config.h>
-#include <shogun/latent/LatentSVM.h>
 
 #ifdef USE_GPL_SHOGUN
+#include <shogun/latent/LatentSVM.h>
 
 using namespace shogun;
 using ::testing::Return;

diff --git a/tests/unit/multiclass/MulticlassOCAS_unittest.cc b/tests/unit/multiclass/MulticlassOCAS_unittest.cc
@@ -2,11 +2,9 @@
 #include <shogun/evaluation/MulticlassAccuracy.h>
 #include <shogun/features/DataGenerator.h>
 #include <shogun/features/DenseFeatures.h>
-#include <shogun/multiclass/MulticlassOCAS.h>
-
 #include <gtest/gtest.h>
-
 #ifdef USE_GPL_SHOGUN
+#include <shogun/multiclass/MulticlassOCAS.h>
 
 using namespace shogun;