Permalink
Browse files

squashed - remove HAVE_EIGEN3 flags

  • Loading branch information...
1 parent 135a828 commit 6c36c422d03f4af5178aeac51eabba0287d4eb37 @OXPHOS OXPHOS committed Mar 23, 2016
Showing with 26 additions and 532 deletions.
  1. +0 −2 benchmarks/sparse_test.cpp
  2. +0 −1 doc/doxygen/Doxyfile_cn.in
  3. +0 −1 doc/doxygen/Doxyfile_en.in
  4. +0 −10 examples/undocumented/libshogun/classifier_gaussian_process_binary_classification.cpp
  5. +0 −2 examples/undocumented/libshogun/classifier_lda.cpp
  6. +0 −2 examples/undocumented/libshogun/classifier_qda.cpp
  7. +0 −7 examples/undocumented/libshogun/converter_diffusionmaps.cpp
  8. +0 −7 examples/undocumented/libshogun/converter_factoranalysis.cpp
  9. +0 −7 examples/undocumented/libshogun/converter_hessianlocallylinearembedding.cpp
  10. +0 −7 examples/undocumented/libshogun/converter_isomap.cpp
  11. +1 −5 examples/undocumented/libshogun/converter_jade_bss.cpp
  12. +0 −7 examples/undocumented/libshogun/converter_kernellocallylinearembedding.cpp
  13. +0 −7 examples/undocumented/libshogun/converter_laplacianeigenmaps.cpp
  14. +0 −7 examples/undocumented/libshogun/converter_linearlocaltangentspacealignment.cpp
  15. +0 −7 examples/undocumented/libshogun/converter_localitypreservingprojections.cpp
  16. +0 −7 examples/undocumented/libshogun/converter_locallylinearembedding.cpp
  17. +0 −7 examples/undocumented/libshogun/converter_localtangentspacealignment.cpp
  18. +0 −7 examples/undocumented/libshogun/converter_multidimensionalscaling.cpp
  19. +0 −7 examples/undocumented/libshogun/converter_neighborhoodpreservingembedding.cpp
  20. +0 −7 examples/undocumented/libshogun/converter_stochasticproximityembedding.cpp
  21. +0 −4 examples/undocumented/libshogun/modelselection_parameter_tree.cpp
  22. +0 −7 examples/undocumented/libshogun/neuralnets_deep_belief_network.cpp
  23. +0 −2 examples/undocumented/libshogun/preprocessor_fisherlda.cpp
  24. +1 −1 examples/undocumented/libshogun/regression_gaussian_process_ard.cpp
  25. +1 −1 examples/undocumented/libshogun/regression_gaussian_process_fitc.cpp
  26. +1 −1 examples/undocumented/libshogun/regression_gaussian_process_gaussian.cpp
  27. +1 −1 examples/undocumented/libshogun/regression_gaussian_process_laplace.cpp
  28. +1 −1 examples/undocumented/libshogun/regression_gaussian_process_product.cpp
  29. +0 −7 examples/undocumented/libshogun/regression_gaussian_process_simple_exact.cpp
  30. +3 −3 examples/undocumented/libshogun/regression_gaussian_process_sum.cpp
  31. +0 −7 examples/undocumented/libshogun/variational_approx_example.cpp
  32. +0 −6 tests/unit/base/SGObject_unittest.cc
  33. +0 −3 tests/unit/classifier/GaussianProcessClassification_unittest.cc
  34. +2 −4 tests/unit/classifier/LDA_unittest.cc
  35. +0 −3 tests/unit/converter/Isomap_unittest.cc
  36. +0 −4 tests/unit/converter/ManifoldSculpting_unittest.cc
  37. +0 −3 tests/unit/converter/MultidimensionalScaling_unittest.cc
  38. +0 −3 tests/unit/converter/TDistributedStochasticNeighborEmbedding_unittest.cc
  39. +0 −3 tests/unit/converter/ica/FFSep_unittest.cc
  40. +0 −3 tests/unit/converter/ica/FastICA_unittest.cc
  41. +0 −3 tests/unit/converter/ica/Jade_unittest.cc
  42. +0 −2 tests/unit/converter/ica/JediSep_unittest.cc
  43. +0 −3 tests/unit/converter/ica/SOBI_unittest.cc
  44. +0 −3 tests/unit/converter/ica/UWedgeSep_unittest.cc
  45. +0 −4 tests/unit/distance/Distance_unittest.cc
  46. +0 −5 tests/unit/distribution/classical/GaussianDistribution_unittest.cc
  47. +0 −3 tests/unit/evaluation/ica/AmariIndex_unittest.cc
  48. +0 −3 tests/unit/evaluation/ica/PermutationMatrix_unittest.cc
  49. +0 −4 tests/unit/kernel/CustomKernel_unittest.cc
  50. +1 −6 tests/unit/kernel/SubsequenceStringKernel_unittest.cc
  51. +0 −7 tests/unit/lib/GPUMatrix_unittest.cc
  52. +0 −6 tests/unit/lib/GPUVector_unittest.cc
  53. +0 −6 tests/unit/lib/SGMatrix_unittest.cc
  54. +0 −4 tests/unit/lib/SGSparseMatrix_unittest.cc
  55. +1 −6 tests/unit/lib/SGVector_unittest.cc
  56. +1 −2 tests/unit/lib/computation/SerialComputationEngine_unittest.cc
  57. +0 −4 tests/unit/machine/gp/EPInferenceMethod_unittest.cc
  58. +0 −4 tests/unit/machine/gp/ExactInferenceMethod_unittest.cc
  59. +1 −4 tests/unit/machine/gp/FITCInferenceMethod_unittest.cc
  60. +0 −4 tests/unit/machine/gp/GaussianLikelihood_unittest.cc
  61. +0 −2 tests/unit/machine/gp/InferenceMethod_unittest.cc
  62. +0 −4 tests/unit/machine/gp/KLApproxDiagonalInferenceMethod_unittest.cc
  63. +0 −4 tests/unit/machine/gp/KLCholeskyInferenceMethod_unittest.cc
  64. +0 −4 tests/unit/machine/gp/KLCovarianceInfernceMethod_unittest.cc
  65. +0 −4 tests/unit/machine/gp/KLDualInferenceMethod_unittest.cc
  66. +0 −4 tests/unit/machine/gp/LogitDVGLikelihood_unittest.cc
  67. +0 −4 tests/unit/machine/gp/LogitLikelihood_unittest.cc
  68. +0 −4 tests/unit/machine/gp/LogitVGLikelihood_unittest.cc
  69. +0 −3 tests/unit/machine/gp/LogitVGPiecewiseBoundLikelihood_unittest.cc
  70. +0 −4 tests/unit/machine/gp/ProbitLikelihood_unittest.cc
  71. +0 −4 tests/unit/machine/gp/ProbitVGLikelihood_unittest.cc
  72. +2 −2 tests/unit/machine/gp/SingleFITCInferenceBase_unittest.cc
  73. +2 −2 tests/unit/machine/gp/SingleFITCLaplacianInferenceMethodWithLBFGS_unittest.cc
  74. +2 −2 tests/unit/machine/gp/SingleFITCLaplacianInferenceMethod_unittest.cc
  75. +0 −3 tests/unit/machine/gp/SingleLaplacianInferenceMethodWithLBFGS_unittest.cc
  76. +0 −4 tests/unit/machine/gp/SingleLaplacianInferenceMethod_unittest.cc
  77. +0 −4 tests/unit/machine/gp/SoftMaxLikelihood_unittest.cc
  78. +0 −4 tests/unit/machine/gp/SparseVGInferenceMethod_unittest.cc
  79. +0 −3 tests/unit/machine/gp/StudentsTLikelihood_unittest.cc
  80. +0 −3 tests/unit/machine/gp/StudentsTVGLikelihood_unittest.cc
  81. +0 −3 tests/unit/mathematics/Integration_unittest.cc
  82. +0 −2 tests/unit/mathematics/Lapack_wrapper_dstemr.cc
  83. +0 −5 tests/unit/mathematics/Statistics_unittest.cc
  84. +0 −4 tests/unit/mathematics/ajd/FFDiag_unittest.cc
  85. +0 −4 tests/unit/mathematics/ajd/JADiagOrth_unittest.cc
  86. +0 −4 tests/unit/mathematics/ajd/JADiag_unittest.cc
  87. +0 −4 tests/unit/mathematics/ajd/JediDiag_unittest.cc
  88. +0 −3 tests/unit/mathematics/ajd/QDiag_unittest.cc
  89. +0 −4 tests/unit/mathematics/ajd/UWedge_unittest.cc
  90. +0 −6 tests/unit/mathematics/linalg/Add_unittest.cc
  91. +0 −6 tests/unit/mathematics/linalg/Apply_unittest.cc
  92. +0 −2 tests/unit/mathematics/linalg/CGMShiftedFamilySolver_unittest.cc
  93. +0 −2 tests/unit/mathematics/linalg/ConjugateGradientSolver_unittest.cc
  94. +0 −2 tests/unit/mathematics/linalg/ConjugateOrthogonalCGSolver_unittest.cc
  95. +0 −6 tests/unit/mathematics/linalg/Convolve_unittest.cc
  96. +0 −2 tests/unit/mathematics/linalg/DenseExactLogJob_unittest.cc
  97. +0 −2 tests/unit/mathematics/linalg/DenseMatrixExactLog_unittest.cc
  98. +0 −2 tests/unit/mathematics/linalg/DenseMatrixOperator_unittest.cc
  99. +0 −2 tests/unit/mathematics/linalg/DirectEigenSolver_unittest.cc
  100. +0 −3 tests/unit/mathematics/linalg/DirectLinearSolverComplex_unittest.cc
  101. +0 −2 tests/unit/mathematics/linalg/DirectSparseLinearSolver_unittest.cc
  102. +0 −9 tests/unit/mathematics/linalg/DotProduct_unittest.cc
  103. +0 −2 tests/unit/mathematics/linalg/ElementwiseOperations_unittest.cc
  104. +0 −8 tests/unit/mathematics/linalg/ElementwiseProduct_unittest.cc
  105. +0 −2 tests/unit/mathematics/linalg/IndividualJobResultAggregator_unittest.cc
  106. +0 −2 tests/unit/mathematics/linalg/LanczosEigenSolver_unittest.cc
  107. +0 −2 tests/unit/mathematics/linalg/LogDetEstimator_unittest.cc
  108. +0 −4 tests/unit/mathematics/linalg/MatrixElementwiseSquare_unittest.cc
  109. +0 −2 tests/unit/mathematics/linalg/MatrixOperator_unittest.cc
  110. +0 −5 tests/unit/mathematics/linalg/MatrixProduct_unittest.cc
  111. +0 −4 tests/unit/mathematics/linalg/MatrixSum_unittest.cc
  112. +0 −4 tests/unit/mathematics/linalg/Max_unittest.cc
  113. +0 −2 tests/unit/mathematics/linalg/NormalSampler_unittest.cc
  114. +0 −2 tests/unit/mathematics/linalg/ProbingSampler_unittest.cc
  115. +0 −2 tests/unit/mathematics/linalg/RationalApproximationCGMJob_unittest.cc
  116. +0 −2 tests/unit/mathematics/linalg/RationalApproximationIndividualJob_unittest.cc
  117. +0 −2 tests/unit/mathematics/linalg/RationalApproximation_unittest.cc
  118. +0 −4 tests/unit/mathematics/linalg/Scale_unittest.cc
  119. +0 −4 tests/unit/mathematics/linalg/SetRowsConst_unittest.cc
  120. +0 −2 tests/unit/mathematics/linalg/SparseMatrixOperator_unittest.cc
  121. +0 −16 tests/unit/mathematics/linalg/SpecialPurpose_unittest.cc
  122. +0 −5 tests/unit/mathematics/linalg/VectorSum_unittest.cc
  123. +0 −4 tests/unit/metric/LMNNImpl_unittest.cc
  124. +0 −2 tests/unit/metric/LMNN_unittest.cc
  125. +2 −2 tests/unit/modelselection/GradientModelSelection_unittest.cc
  126. +0 −2 tests/unit/multiclass/MCLDA_unittest.cc
  127. +0 −2 tests/unit/multiclass/QDA_unittest.cc
  128. +0 −4 tests/unit/neuralnets/DeepBeliefNetwork_unittest.cc
  129. +1 −4 tests/unit/neuralnets/RBM_unittest.cc
  130. +1 −2 tests/unit/optimization/StochasticMinimizers_unittest.cc
  131. +1 −2 tests/unit/optimization/StochasticMinimizers_unittest.h
  132. +0 −3 tests/unit/optimization/lbfgs/lbfgs_unittest.cc
  133. +0 −2 tests/unit/preprocessor/FisherLDA_unittest.cc
  134. +0 −3 tests/unit/preprocessor/PCA_unittest.cc
  135. +0 −4 tests/unit/regression/GaussianProcessRegression_unittest.cc
  136. +0 −2 tests/unit/statistics/NOCCO_unittest.cc
  137. +0 −7 tests/unit/statistics/QuadraticTimeMMD_unittest.cc
@@ -9,7 +9,6 @@
#include <shogun/lib/common.h>
-#ifdef HAVE_EIGEN3
#include <shogun/lib/Time.h>
#include <shogun/lib/SGVector.h>
#include <shogun/lib/SGSparseMatrix.h>
@@ -208,4 +207,3 @@ int main(int argc, char** argv)
return 0;
}
-#endif // HAVE_EIGEN3
@@ -2046,7 +2046,6 @@ INCLUDE_FILE_PATTERNS = *.h
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = HAVE_LAPACK \
- HAVE_EIGEN3 \
HAVE_NLOPT \
HAVE_ATLAS \
HAVE_PYTHON \
@@ -2049,7 +2049,6 @@ INCLUDE_FILE_PATTERNS = *.h
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = HAVE_LAPACK \
- HAVE_EIGEN3 \
HAVE_NLOPT \
HAVE_ATLAS \
HAVE_PYTHON \
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
// Eigen3 is required for working with this example
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/labels/BinaryLabels.h>
@@ -120,12 +119,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-
-#else
-
-int main(int argc, char **argv)
-{
- return 0;
-}
-
-#endif /* HAVE_EIGEN3 */
@@ -30,7 +30,6 @@ using namespace shogun;
void test()
{
#ifdef HAVE_LAPACK
-#ifdef HAVE_EIGEN3
SGVector< float64_t > lab(CLASSES*NUM);
SGMatrix< float64_t > feat(DIMS, CLASSES*NUM);
@@ -59,7 +58,6 @@ void test()
SG_UNREF(output);
SG_UNREF(lda);
#endif
-#endif
}
int main(int argc, char ** argv)
@@ -24,7 +24,6 @@ using namespace shogun;
void test()
{
-#ifdef HAVE_EIGEN3
#ifdef HAVE_LAPACK
SGVector< float64_t > lab(CLASSES*NUM);
SGMatrix< float64_t > feat(DIMS, CLASSES*NUM);
@@ -54,7 +53,6 @@ void test()
SG_UNREF(output);
SG_UNREF(qda);
#endif // HAVE_LAPACK
-#endif // HAVE_EIGEN3
}
int main(int argc, char ** argv)
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/DiffusionMaps.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -9,7 +9,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/FactorAnalysis.h>
@@ -37,9 +36,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/HessianLocallyLinearEmbedding.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/Isomap.h>
@@ -42,9 +41,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -16,7 +16,6 @@
using namespace shogun;
-#ifdef HAVE_EIGEN3
#include <shogun/features/DenseFeatures.h>
#include <shogun/mathematics/Math.h>
@@ -100,15 +99,12 @@ void test()
return;
}
-#endif // HAVE_EIGEN3
-
int main(int argc, char ** argv)
{
init_shogun_with_defaults();
-#ifdef HAVE_EIGEN3
test();
-#endif // HAVE_EIGEN3
+
exit_shogun();
return 0;
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/KernelLocallyLinearEmbedding.h>
@@ -44,9 +43,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/LaplacianEigenmaps.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/LinearLocalTangentSpaceAlignment.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/LocalityPreservingProjections.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -9,7 +9,6 @@
*/
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/LocallyLinearEmbedding.h>
@@ -40,9 +39,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/LocalTangentSpaceAlignment.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/MultidimensionalScaling.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/NeighborhoodPreservingEmbedding.h>
@@ -41,9 +40,3 @@ int main(int argc, char** argv)
exit_shogun();
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -10,7 +10,6 @@
#include <shogun/lib/config.h>
-#ifdef HAVE_EIGEN3
#include <shogun/base/init.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/converter/StochasticProximityEmbedding.h>
@@ -62,9 +61,3 @@ int main()
return 0;
}
-#else
-int main(int argc, char **argv)
-{
- return 0;
-}
-#endif
@@ -185,7 +185,6 @@ CModelSelectionParameters* create_param_tree_3()
return root;
}
-#ifdef HAVE_EIGEN3
CModelSelectionParameters* create_param_tree_4a()
{
CModelSelectionParameters* root=new CModelSelectionParameters();
@@ -339,7 +338,6 @@ CModelSelectionParameters* create_param_tree_5()
return root;
}
-#endif
int main(int argc, char **argv)
{
@@ -364,7 +362,6 @@ int main(int argc, char **argv)
test_tree(tree);
SG_UNREF(tree);
-#ifdef HAVE_EIGEN3
tree=create_param_tree_4a();
SG_REF(tree);
test_tree(tree);
@@ -379,7 +376,6 @@ int main(int argc, char **argv)
SG_REF(tree);
test_tree(tree);
SG_UNREF(tree);
-#endif
exit_shogun();
@@ -32,7 +32,6 @@
*/
#include <shogun/base/init.h>
-#ifdef HAVE_EIGEN3
#include <shogun/mathematics/Math.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/mathematics/Statistics.h>
@@ -122,9 +121,3 @@ int main(int, char*[])
exit_shogun();
return 0;
}
-#else
-int main(int, char*[])
-{
- return 0;
-}
-#endif
Oops, something went wrong.

0 comments on commit 6c36c42

Please sign in to comment.