diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index e4941ad1a8..8b15323b33 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -49,7 +49,7 @@ fi cd ${package_dir} -SKBUILD_CONFIGURE_OPTIONS="-DCUML_BUILD_WHEELS=ON -DDETECT_CONDA_ENV=OFF -DDISABLE_DEPRECATION_WARNINGS=ON -DCPM_cumlprims_mg_SOURCE=${GITHUB_WORKSPACE}/cumlprims_mg/" \ +SKBUILD_CONFIGURE_OPTIONS="-DDETECT_CONDA_ENV=OFF -DDISABLE_DEPRECATION_WARNINGS=ON -DCPM_cumlprims_mg_SOURCE=${GITHUB_WORKSPACE}/cumlprims_mg/" \ python -m pip wheel . \ -w dist \ -vvv \ diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 4314afb06e..e639f8a71c 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -43,7 +43,6 @@ project( # - User Options -------------------------------------------------------------- option(CUML_UNIVERSAL "Build all cuML Python components." ON) option(FIND_CUML_CPP "Search for existing CUML C++ installations before defaulting to local files" OFF) -option(CUML_BUILD_WHEELS "Whether this build is generating a Python wheel." OFF) option(SINGLEGPU "Disable all mnmg components and comms libraries" OFF) set(CUML_RAFT_CLONE_ON_PIN OFF) @@ -78,11 +77,7 @@ endif() include(rapids-cython) -if(CUML_BUILD_WHEELS) - set(CUML_PYTHON_TREELITE_TARGET treelite::treelite_static) -else() - set(CUML_PYTHON_TREELITE_TARGET treelite::treelite) -endif() +set(CUML_PYTHON_TREELITE_TARGET treelite::treelite) if(NOT ${CUML_CPU}) if(NOT cuml_FOUND) @@ -93,26 +88,21 @@ if(NOT ${CUML_CPU}) set(BUILD_CUML_BENCH OFF) set(BUILD_CUML_PRIMS_BENCH OFF) set(CUML_EXPORT_TREELITE_LINKAGE ON) - - set(_exclude_from_all "") - if(CUML_BUILD_WHEELS) - # Statically link dependencies if building wheels - set(CUDA_STATIC_RUNTIME ON) - set(CUML_USE_RAFT_STATIC ON) - set(CUML_USE_FAISS_STATIC ON) - set(CUML_USE_TREELITE_STATIC ON) - set(CUML_USE_CUMLPRIMS_MG_STATIC ON) - # Don't install the static libs into wheels - set(CUML_EXCLUDE_RAFT_FROM_ALL ON) - set(RAFT_EXCLUDE_FAISS_FROM_ALL ON) - set(CUML_EXCLUDE_TREELITE_FROM_ALL ON) - set(CUML_EXCLUDE_CUMLPRIMS_MG_FROM_ALL ON) - - # Don't install the cuML C++ targets into wheels - set(_exclude_from_all EXCLUDE_FROM_ALL) - endif() - - add_subdirectory(../cpp cuml-cpp ${_exclude_from_all}) + set(CUML_PYTHON_TREELITE_TARGET treelite::treelite_static) + + # Statically link dependencies if building wheels + set(CUDA_STATIC_RUNTIME ON) + set(CUML_USE_RAFT_STATIC ON) + set(CUML_USE_FAISS_STATIC ON) + set(CUML_USE_TREELITE_STATIC ON) + set(CUML_USE_CUMLPRIMS_MG_STATIC ON) + # Don't install the static libs into wheels + set(CUML_EXCLUDE_RAFT_FROM_ALL ON) + set(RAFT_EXCLUDE_FAISS_FROM_ALL ON) + set(CUML_EXCLUDE_TREELITE_FROM_ALL ON) + set(CUML_EXCLUDE_CUMLPRIMS_MG_FROM_ALL ON) + + add_subdirectory(../cpp cuml-cpp EXCLUDE_FROM_ALL) set(cython_lib_dir cuml) install(TARGETS ${CUML_CPP_TARGET} DESTINATION ${cython_lib_dir})