diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b376f07ca8..8447183ca1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -69,8 +69,7 @@ repos: CMakeLists[.]txt$| CMakeLists_standalone[.]txt$| [.]flake8[.]cython$| - meta[.]yaml$| - setup[.]cfg$ + meta[.]yaml$ exclude: | (?x) cpp/src/tsne/cannylab/bh[.]cu$| diff --git a/BUILD.md b/BUILD.md index 059836e57d..e67f674372 100644 --- a/BUILD.md +++ b/BUILD.md @@ -234,7 +234,6 @@ cuML's cmake has the following configurable flags available: | BUILD_PRIMS_TESTS | [ON, OFF] | ON | Enable/disable building cuML algorithm test executable `prims_test`. | | BUILD_CUML_EXAMPLES | [ON, OFF] | ON | Enable/disable building cuML C++ API usage examples. | | BUILD_CUML_BENCH | [ON, OFF] | ON | Enable/disable building of cuML C++ benchark. | -| BUILD_CUML_PRIMS_BENCH | [ON, OFF] | ON | Enable/disable building of ml-prims C++ benchark. | | CMAKE_CXX11_ABI | [ON, OFF] | ON | Enable/disable the GLIBCXX11 ABI | | DETECT_CONDA_ENV | [ON, OFF] | ON | Use detection of conda environment for dependencies. If set to ON, and no value for CMAKE_INSTALL_PREFIX is passed, then it'll assign it to $CONDA_PREFIX (to install in the active environment). | | DISABLE_OPENMP | [ON, OFF] | OFF | Set to `ON` to disable OpenMP | diff --git a/cpp/README.md b/cpp/README.md index fc85d23288..10ffa01617 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -37,7 +37,6 @@ Current cmake offers the following configuration options: | BUILD_PRIMS_TESTS | [ON, OFF] | ON | Enable/disable building cuML algorithm test executable `prims_test`. | | BUILD_CUML_EXAMPLES | [ON, OFF] | ON | Enable/disable building cuML C++ API usage examples. | | BUILD_CUML_BENCH | [ON, OFF] | ON | Enable/disable building of cuML C++ benchark. | -| BUILD_CUML_PRIMS_BENCH | [ON, OFF] | ON | Enable/disable building of ml-prims C++ benchark. | | BUILD_CUML_STD_COMMS | [ON, OFF] | ON | Enable/disable building cuML NCCL+UCX communicator for running multi-node multi-GPU algorithms. Note that UCX support can also be enabled/disabled (see below). The standard communicator and MPI communicator are not mutually exclusive and can both be installed at the same time. | | WITH_UCX | [ON, OFF] | OFF | Enable/disable UCX support in the standard cuML communicator. Algorithms requiring point-to-point messaging will not work when this is disabled. This flag is ignored if BUILD_CUML_STD_COMMS is set to OFF. | | BUILD_CUML_MPI_COMMS | [ON, OFF] | OFF | Enable/disable building cuML MPI+NCCL communicator for running multi-node multi-GPU C++ tests. MPI communicator and STD communicator may both be installed at the same time. If OFF, it overrides BUILD_CUML_MG_TESTS to be OFF as well. | diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index dbfff6d1f2..3240c730c5 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -54,7 +54,6 @@ function(find_and_configure_raft) EXCLUDE_FROM_ALL ${PKG_EXCLUDE_FROM_ALL} OPTIONS "BUILD_TESTS OFF" - "BUILD_BENCH OFF" "BUILD_PRIMS_BENCH OFF" "BUILD_CAGRA_HNSWLIB OFF" "RAFT_COMPILE_LIBRARY OFF" diff --git a/python/cuml/CMakeLists.txt b/python/cuml/CMakeLists.txt index 221b5ebf75..1dcaecc92f 100644 --- a/python/cuml/CMakeLists.txt +++ b/python/cuml/CMakeLists.txt @@ -83,14 +83,12 @@ if(NOT CUML_CPU) set(BUILD_CUML_C_LIBRARY OFF) set(BUILD_CUML_EXAMPLES OFF) set(BUILD_CUML_BENCH OFF) - set(BUILD_CUML_PRIMS_BENCH OFF) set(CUML_EXPORT_TREELITE_LINKAGE ON) set(CUML_PYTHON_TREELITE_TARGET treelite::treelite_static) # Statically link dependencies if building wheels set(CUDA_STATIC_RUNTIME ON) set(CUML_USE_CUVS_STATIC ON) - set(CUML_USE_FAISS_STATIC ON) set(CUML_USE_TREELITE_STATIC ON) set(CUML_USE_CUMLPRIMS_MG_STATIC ON) # Link to the CUDA wheels with shared libraries for CUDA 12+