Permalink
Browse files

remove all static interfaces and integration tests

  • Loading branch information...
1 parent e530af1 commit 2bcf37d531a3977fdc18e39201d34dc30ec9a285 @vigsterkr vigsterkr committed Oct 25, 2016
Showing with 12 additions and 16,963 deletions.
  1. +0 −3 .gitignore
  2. +11 −44 CMakeLists.txt
  3. +1 −1 debian
  4. +0 −17 src/interfaces/cmdline_static/CMakeLists.txt
  5. +0 −794 src/interfaces/cmdline_static/CmdLineInterface.cpp
  6. +0 −184 src/interfaces/cmdline_static/CmdLineInterface.h
  7. +0 −20 src/interfaces/cmdline_static/cmdline.cpp
  8. +0 −15 src/interfaces/elwms_static/elwms.cpp
  9. +0 −13 src/interfaces/matlab_static/CMakeLists.txt
  10. +0 −703 src/interfaces/matlab_static/MatlabInterface.cpp
  11. +0 −188 src/interfaces/matlab_static/MatlabInterface.h
  12. +0 −12 src/interfaces/octave_static/CMakeLists.txt
  13. +0 −842 src/interfaces/octave_static/OctaveInterface.cpp
  14. +0 −208 src/interfaces/octave_static/OctaveInterface.h
  15. +0 −12 src/interfaces/python_static/CMakeLists.txt
  16. +0 −996 src/interfaces/python_static/PythonInterface.cpp
  17. +0 −237 src/interfaces/python_static/PythonInterface.h
  18. +0 −23 src/interfaces/r_static/CMakeLists.txt
  19. +0 −782 src/interfaces/r_static/RInterface.cpp
  20. +0 −180 src/interfaces/r_static/RInterface.h
  21. +0 −22 tests/integration/CMakeLists.txt
  22. +0 −165 tests/integration/README
  23. +0 −12 tests/integration/blacklist
  24. +0 −35 tests/integration/cmdline_static/test.sg
  25. +0 −36 tests/integration/cmdline_static/test_all.sh
  26. +0 −1 tests/integration/data
  27. +0 −6 tests/integration/generate_testdata.py
  28. +0 −66 tests/integration/generator/__init__.py
  29. +0 −54 tests/integration/generator/category.py
  30. +0 −475 tests/integration/generator/classifier.py
  31. +0 −64 tests/integration/generator/clustering.py
  32. +0 −195 tests/integration/generator/dataop.py
  33. +0 −114 tests/integration/generator/distance.py
  34. +0 −120 tests/integration/generator/distribution.py
  35. +0 −145 tests/integration/generator/featop.py
  36. +0 −424 tests/integration/generator/fileop.py
  37. +0 −607 tests/integration/generator/kernel.py
  38. +0 −107 tests/integration/generator/preproc.py
  39. +0 −125 tests/integration/generator/regression.py
  40. +0 −36 tests/integration/libshogun/test_all.sh
  41. +0 −57 tests/integration/lua_modular/generator.lua
  42. +0 −138 tests/integration/matlab_and_octave/classifier.m
  43. +0 −59 tests/integration/matlab_and_octave/clustering.m
  44. +0 −24 tests/integration/matlab_and_octave/distance.m
  45. +0 −28 tests/integration/matlab_and_octave/distribution.m
  46. +0 −27 tests/integration/matlab_and_octave/kernel.m
  47. +0 −34 tests/integration/matlab_and_octave/preprocessor.m
  48. +0 −60 tests/integration/matlab_and_octave/regression.m
  49. +0 −65 tests/integration/matlab_and_octave/test_all.sh
  50. +0 −13 tests/integration/matlab_and_octave/test_one.sh
  51. +0 −27 tests/integration/matlab_and_octave/util/check_accuracy.m
  52. +0 −34 tests/integration/matlab_and_octave/util/convert_features_and_add_preproc.m
  53. +0 −15 tests/integration/matlab_and_octave/util/fix_classifier_name_inconsistency.m
  54. +0 −2 tests/integration/matlab_and_octave/util/fix_clustering_name_inconsistency.m
  55. +0 −14 tests/integration/matlab_and_octave/util/fix_distance_name_inconsistency.m
  56. +0 −32 tests/integration/matlab_and_octave/util/fix_kernel_name_inconsistency.m
  57. +0 −10 tests/integration/matlab_and_octave/util/fix_normalizer_name_inconsistency.m
  58. +0 −2 tests/integration/matlab_and_octave/util/fix_preproc_name_inconsistency.m
  59. +0 −2 tests/integration/matlab_and_octave/util/fix_regression_name_inconsistency.m
  60. +0 −178 tests/integration/matlab_and_octave/util/globals.m
  61. +0 −19 tests/integration/matlab_and_octave/util/set_distance.m
  62. +0 −115 tests/integration/matlab_and_octave/util/set_features.m
  63. +0 −208 tests/integration/matlab_and_octave/util/set_kernel.m
  64. +0 −2 tests/integration/matlab_and_octave/util/tobool.m
  65. +0 −1 tests/integration/matlab_static
  66. +0 −164 tests/integration/octave_modular/classifier.m
  67. +0 −46 tests/integration/octave_modular/clustering.m
  68. +0 −23 tests/integration/octave_modular/distance.m
  69. +0 −52 tests/integration/octave_modular/distribution.m
  70. +0 −42 tests/integration/octave_modular/kernel.m
  71. +0 −44 tests/integration/octave_modular/preprocessor.m
  72. +0 −70 tests/integration/octave_modular/regression.m
  73. +0 −51 tests/integration/octave_modular/test_all.sh
  74. +0 −15 tests/integration/octave_modular/test_one.sh
  75. +0 −27 tests/integration/octave_modular/util/check_accuracy.m
  76. +0 −48 tests/integration/octave_modular/util/convert_features_and_add_preproc.m
  77. +0 −179 tests/integration/octave_modular/util/globals.m
  78. +0 −81 tests/integration/octave_modular/util/set_distance.m
  79. +0 −189 tests/integration/octave_modular/util/set_features.m
  80. +0 −325 tests/integration/octave_modular/util/set_kernel.m
  81. +0 −13 tests/integration/octave_modular/util/set_pie.m
  82. +0 −59 tests/integration/octave_modular/util/set_pos_and_neg.m
  83. +0 −2 tests/integration/octave_modular/util/tobool.m
  84. +0 −1 tests/integration/octave_static
  85. +0 −13 tests/integration/perl_modular/README
  86. +0 −215 tests/integration/perl_modular/classifier.pm
  87. +0 −56 tests/integration/perl_modular/clustering.pm
  88. +0 −43 tests/integration/perl_modular/distance.pm
  89. +0 −81 tests/integration/perl_modular/distribution.pm
  90. +0 −128 tests/integration/perl_modular/generator.pm
  91. +0 −327 tests/integration/perl_modular/kernel.pm
  92. +0 −44 tests/integration/perl_modular/preprocessor.pm
  93. +0 −74 tests/integration/perl_modular/regression.pm
  94. +0 −52 tests/integration/perl_modular/test_all.sh
  95. +0 −171 tests/integration/perl_modular/test_one.pl
  96. +0 −47 tests/integration/perl_modular/test_svm_kernel_multiple.pl
  97. +0 −272 tests/integration/perl_modular/tester.pl
  98. +0 −254 tests/integration/perl_modular/util.pm
  99. +0 −41 tests/integration/python_modular/CMakeLists.txt
  100. +0 −8 tests/integration/python_modular/README
  101. +0 −172 tests/integration/python_modular/classifier.py
  102. +0 −50 tests/integration/python_modular/clustering.py
  103. +0 −34 tests/integration/python_modular/distance.py
  104. +0 −62 tests/integration/python_modular/distribution.py
  105. +0 −114 tests/integration/python_modular/generator.py
  106. +0 −227 tests/integration/python_modular/kernel.py
  107. +0 −42 tests/integration/python_modular/preprocessor.py
  108. +0 −74 tests/integration/python_modular/regression.py
  109. +0 −52 tests/integration/python_modular/test_all.sh
  110. +0 −119 tests/integration/python_modular/test_one.py
  111. +0 −46 tests/integration/python_modular/test_svm_kernel_multiple.py
  112. +0 −216 tests/integration/python_modular/tester.py
  113. +0 −1 tests/integration/python_modular/tests
  114. +0 −194 tests/integration/python_modular/util.py
  115. +0 −140 tests/integration/python_static/classifier.py
  116. +0 −72 tests/integration/python_static/clustering.py
  117. +0 −35 tests/integration/python_static/distance.py
  118. +0 −58 tests/integration/python_static/distribution.py
  119. +0 −203 tests/integration/python_static/kernel.py
  120. +0 −46 tests/integration/python_static/preprocessor.py
  121. +0 −81 tests/integration/python_static/regression.py
  122. +0 −50 tests/integration/python_static/test_all.sh
  123. +0 −113 tests/integration/python_static/test_one.py
  124. +0 −46 tests/integration/python_static/test_svm_kernel_multiple.py
  125. +0 −219 tests/integration/python_static/util.py
  126. +0 −156 tests/integration/r_modular/classifier.R
  127. +0 −44 tests/integration/r_modular/clustering.R
  128. +0 −25 tests/integration/r_modular/distance.R
  129. +0 −46 tests/integration/r_modular/distribution.R
  130. +0 −24 tests/integration/r_modular/kernel.R
  131. +0 −46 tests/integration/r_modular/preproc.R
  132. +0 −66 tests/integration/r_modular/regression.R
  133. +0 −51 tests/integration/r_modular/test_all.sh
  134. +0 −22 tests/integration/r_modular/test_one.R
  135. +0 −7 tests/integration/r_modular/test_one.sh
  136. +0 −29 tests/integration/r_modular/util/check_accuracy.R
  137. +0 −35 tests/integration/r_modular/util/convert_features_and_add_preproc.R
  138. +0 −21 tests/integration/r_modular/util/get_distance.R
  139. +0 −137 tests/integration/r_modular/util/get_features.R
  140. +0 −275 tests/integration/r_modular/util/get_kernel.R
  141. +0 −9 tests/integration/r_modular/util/get_pie.R
  142. +0 −45 tests/integration/r_modular/util/get_posneg.R
  143. +0 −35 tests/integration/r_modular/util/read_mfile.R
  144. +0 −9 tests/integration/r_modular/util/tobool.R
  145. +0 −115 tests/integration/r_static/classifier.R
  146. +0 −58 tests/integration/r_static/clustering.R
  147. +0 −22 tests/integration/r_static/distance.R
  148. +0 −23 tests/integration/r_static/distribution.R
  149. +0 −24 tests/integration/r_static/kernel.R
  150. +0 −34 tests/integration/r_static/preprocessor.R
  151. +0 −57 tests/integration/r_static/regression.R
  152. +0 −52 tests/integration/r_static/test_all.sh
  153. +0 −22 tests/integration/r_static/test_one.R
  154. +0 −7 tests/integration/r_static/test_one.sh
  155. +0 −26 tests/integration/r_static/util/check_accuracy.R
  156. +0 −28 tests/integration/r_static/util/convert_features_and_add_preproc.R
  157. +0 −12 tests/integration/r_static/util/fix_classifier_name_inconsistency.R
  158. +0 −3 tests/integration/r_static/util/fix_clustering_name_inconsistency.R
  159. +0 −12 tests/integration/r_static/util/fix_distance_name_inconsistency.R
  160. +0 −38 tests/integration/r_static/util/fix_kernel_name_inconsistency.R
  161. +0 −13 tests/integration/r_static/util/fix_normalizer_name_inconsistency.R
  162. +0 −3 tests/integration/r_static/util/fix_preproc_name_inconsistency.R
  163. +0 −3 tests/integration/r_static/util/fix_regression_name_inconsistency.R
  164. +0 −35 tests/integration/r_static/util/read_mfile.R
  165. +0 −17 tests/integration/r_static/util/set_distance.R
  166. +0 −96 tests/integration/r_static/util/set_features.R
  167. +0 −164 tests/integration/r_static/util/set_kernel.R
  168. +0 −9 tests/integration/r_static/util/tobool.R
  169. +0 −36 tests/integration/test_configure.py
View
@@ -55,9 +55,6 @@ cpplint.py
/src/configure-*-*.c*
/src/build-local
-# static interfaces
-/src/interfaces/cmdline_static/shogun
-
# modular interfaces
/src/interfaces/*_modular/*.doxy
/src/interfaces/*_modular/Evaluation.i
View
@@ -263,7 +263,7 @@ ENDIF()
# this has been only fixed in swig 2.0.12 or later.
IF (NOT ((CYGWIN AND ENABLE_TESTING) OR (DARWIN AND COMPILE_MODULAR_INTERFACE
- AND SWIG_VERSION VERSION_LESS "2.0.12") OR MatlabStatic))
+ AND SWIG_VERSION VERSION_LESS "2.0.12")))
INCLUDE(CheckCXX11Features)
IF(_HAS_CXX11_FLAG)
@@ -384,6 +384,13 @@ OPTION(PerlModular "Perl Modular" OFF)
OPTION(RubyModular "Ruby Modular" OFF)
OPTION(CSharpModular "CSharp Modular" OFF)
+SET(STATIC_INTERFACES PythonStatic;OctaveStatic;RStatic;MatlabStatic;CmdLineStatic)
+FOREACH(static_interface ${STATIC_INTERFACES})
+ if(${static_interface})
+ MESSAGE(FATAL_ERROR "Static interfaces are deprecated, use the corresponding modular interface!")
+ endif()
+ENDFOREACH()
+
# Debugging Python-interface with CTest
OPTION(ENABLE_PYTHON_DEBUG "Enable Python-interface-debugging with CTest" OFF)
@@ -958,7 +965,7 @@ IF(REDUCE_SWIG_DEBUG)
ENDIF(REDUCE_SWIG_DEBUG)
# python modular
-IF (PythonModular OR PythonStatic)
+IF (PythonModular)
# find python library for the found python interpreter
# i.e. versions should match!
FIND_PACKAGE(PythonLibs ${PYTHON_VERSION_STRING} EXACT REQUIRED)
@@ -999,12 +1006,6 @@ IF (PythonModular OR PythonStatic)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/python_modular)
ENDIF()
ENDIF()
-
- IF(PythonStatic)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/src/interfaces/python_static)
- add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/python_static)
- ENDIF()
- ENDIF()
ENDIF()
# lua modular
@@ -1055,7 +1056,7 @@ IF (RubyModular)
ENDIF()
# octave modular
-IF (OctaveModular OR OctaveStatic)
+IF (OctaveModular)
FIND_PACKAGE(Octave 3.6 REQUIRED)
SET(OCTAVE_APIVERSION ${OCTAVE_API_VERSION})
@@ -1065,12 +1066,6 @@ IF (OctaveModular OR OctaveStatic)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/octave_modular)
ENDIF()
ENDIF()
-
- IF(OctaveStatic)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/src/interfaces/octave_static)
- add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/octave_static)
- ENDIF()
- ENDIF()
ENDIF()
# csharp modular
@@ -1083,7 +1078,7 @@ IF (CSharpModular)
ENDIF()
# r modular
-IF (RModular OR RStatic)
+IF (RModular)
FIND_PACKAGE(R REQUIRED)
IF (RModular)
@@ -1092,12 +1087,6 @@ IF (RModular OR RStatic)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/r_modular)
ENDIF()
ENDIF()
-
- IF (RStatic)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/src/interfaces/r_static)
- add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/r_static)
- ENDIF()
- ENDIF()
ENDIF()
# perl modular
@@ -1109,23 +1098,6 @@ IF (PerlModular)
ENDIF()
ENDIF()
-IF (MatlabStatic)
- FIND_PACKAGE(Matlab REQUIRED)
- IF(MATLAB_FOUND)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/src/interfaces/matlab_static)
- add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/matlab_static)
- ENDIF()
- ELSE()
- MESSAGE(FATAL_ERROR "Could not find Matlab, which is required for compiling matlab_static interface. Try setting MATLAB_ROOT enviroment variable to the right path")
- ENDIF()
-ENDIF()
-
-IF (CmdLineStatic)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/src/interfaces/cmdline_static)
- add_subdirectory(${CMAKE_SOURCE_DIR}/src/interfaces/cmdline_static)
- ENDIF()
-ENDIF()
-
IF (SVMLight)
MESSAGE(STATUS ${SVMLightWarning})
ENDIF()
@@ -1143,7 +1115,6 @@ ENDIF()
OPTION(ENABLE_TESTING "Enable testing" OFF)
OPTION(TRAVIS_DISABLE_UNIT_TESTS "Disable unit testing to speed up jobs on travis-ci" OFF)
OPTION(TRAVIS_DISABLE_LIBSHOGUN_TESTS "Disable libshogun tests to speed up jobs on travis-ci" OFF)
-OPTION(INTEGRATION_TESTS_ENABLED "Enable integration testing (legacy)" OFF)
OPTION(TRAVIS_DISABLE_META_CPP "Disable cpp meta examples and integration testing to speed up jobs on travis-ci" OFF)
OPTION(DISABLE_META_INTEGRATION_TESTS "Disable meta integration testing to speed up build" OFF)
@@ -1155,10 +1126,6 @@ IF(ENABLE_TESTING)
ENDIF()
IF(EXISTS ${CMAKE_SOURCE_DIR}/tests)
- if (INTEGRATION_TESTS_ENABLED AND EXISTS ${CMAKE_SOURCE_DIR}/tests/integration)
- add_subdirectory(${CMAKE_SOURCE_DIR}/tests/integration)
- ENDIF()
-
IF (NOT TRAVIS_DISABLE_UNIT_TESTS AND EXISTS ${CMAKE_SOURCE_DIR}/tests/unit)
add_subdirectory(${CMAKE_SOURCE_DIR}/tests/unit)
ENDIF()
@@ -1,17 +0,0 @@
-include_directories(${SYSTEM_INCLUDES})
-SET(CMDLINE_STATIC_EXEC "${CMAKE_CURRENT_BINARY_DIR}/cmdline_static" PARENT_SCOPE)
-add_executable(cmdline_static cmdline.cpp CmdLineInterface.cpp)
-target_link_libraries(cmdline_static shogun)
-
-# Add static-interface to the dependencies of modular interfaces to make
-# sure nothing will infer with them being build single-threaded.
-IF(SWIG_SINGLE_THREADED)
- FOREACH(SG_MODULAR_INTERFACE_TARGET ${SG_MODULAR_INTERFACE_TARGETS})
- ADD_DEPENDENCIES(${SG_MODULAR_INTERFACE_TARGET} cmdline_static)
- ENDFOREACH(SG_MODULAR_INTERFACE_TARGET ${SG_MODULAR_INTERFACE_TARGETS})
-ENDIF(SWIG_SINGLE_THREADED)
-
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cmdline_static
- DESTINATION bin
- COMPONENT cmdline
- RENAME shogun)
Oops, something went wrong.

0 comments on commit 2bcf37d

Please sign in to comment.