ENH change behavior of disabling libcuml++

rlratzel · May 10, 2019 · e65df9f · e65df9f
1 parent e137c0c
commit e65df9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -113,7 +113,7 @@ cuML's cmake has the following configurable flags available:
 | Flag | Possible Values | Default Value | Behavior |
 | --- | --- | --- | --- |
 | BLAS_LIBRARIES | path/to/blas_lib | "" | Optional variable allowing to manually specify location of BLAS library. |
-| BUILD_CUML_CPP_LIBRARY | [ON, OFF]  | ON  | Enable/disable building libcuml++ shared library. If either BUILD_CUML_TESTS or BUILD_CUML_MG_TESTS are set to ON, this variable is forced to be ON |
+| BUILD_CUML_CPP_LIBRARY | [ON, OFF]  | ON  | Enable/disable building libcuml++ shared library. Setting this variable to `OFF` sets the variables BUILD_CUML_TESTS, BUILD_CUML_MG_TESTS and BUILD_CUML_EXAMPLES to `OFF` |
 | BUILD_CUML_TESTS | [ON, OFF]  | ON  |  Enable/disable building cuML algorithm test executable `ml_test`.  |
 | BUILD_CUML_MG_TESTS | [ON, OFF]  | ON  |  Enable/disable building cuML algorithm test executable `ml_mg_test`. |
 | BUILD_PRIM_TESTS | [ON, OFF]  | ON  | Enable/disable building cuML algorithm test executable `prims_test`.  |

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -65,10 +65,12 @@ set(GPU_ARCHS "" CACHE STRING
 set(CMAKE_IGNORE_PATH "${CMAKE_INSTALL_DIR}/lib" CACHE STRING
   "Ignore any libs added implicitly from the CMAKE_INSTALL_DIR")
 
-# Bulding cuml_test or cuml_mg_test executables forces building libcuml++
-if(BUILD_CUML_TESTS OR BUILD_CUML_MG_TESTS)
-  set(BUILD_CUML_CPP_LIBRARY ON)
-endif(BUILD_CUML_TESTS OR BUILD_CUML_MG_TESTS)
+# Disabling libcuml++ disables buidling algorithm tests and examples
+if(NOT BUILD_CUML_CPP_LIBRARY)
+  set(BUILD_CUML_TESTS OFF)
+  set(BUILD_CUML_MG_TESTS OFF)
+  set(BUILD_CUML_EXAMPLES OFF)
+endif(NOT BUILD_CUML_CPP_LIBRARY)
 
 
 ###################################################################################################

diff --git a/cpp/README.md b/cpp/README.md
@@ -29,7 +29,7 @@ Current cmake offers the following configuration options:
 | Flag | Possible Values | Default Value | Behavior |
 | --- | --- | --- | --- |
 | BLAS_LIBRARIES | path/to/blas_lib | "" | Optional variable allowing to manually specify location of BLAS library. |
-| BUILD_CUML_CPP_LIBRARY | [ON, OFF]  | ON  | Enable/disable building libcuml++ shared library. If either BUILD_CUML_TESTS or BUILD_CUML_MG_TESTS are set to ON, this variable is forced to be ON |
+| BUILD_CUML_CPP_LIBRARY | [ON, OFF]  | ON  | Enable/disable building libcuml++ shared library. Setting this variable to `OFF` sets the variables BUILD_CUML_TESTS, BUILD_CUML_MG_TESTS and BUILD_CUML_EXAMPLES to `OFF` |
 | BUILD_CUML_TESTS | [ON, OFF]  | ON  |  Enable/disable building cuML algorithm test executable `ml_test`.  |
 | BUILD_CUML_MG_TESTS | [ON, OFF]  | ON  |  Enable/disable building cuML algorithm test executable `ml_mg_test`. |
 | BUILD_PRIM_TESTS | [ON, OFF]  | ON  | Enable/disable building cuML algorithm test executable `prims_test`.  |