From 87cbf0e659f59e84a1e8d39b61bab3fe2d1f3314 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 4 Dec 2023 15:22:47 -0800 Subject: [PATCH] Remove RMM_BUILD_WHEELS and standardize Python builds --- ci/build_wheel.sh | 2 +- python/CMakeLists.txt | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 6d887e5d2..b2d953361 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -31,7 +31,7 @@ fi cd "${package_dir}" -SKBUILD_CONFIGURE_OPTIONS="-DRMM_BUILD_WHEELS=ON" python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check +python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check mkdir -p final_dist python -m auditwheel repair -w final_dist dist/* diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 35f034421..dc18af3fd 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -29,7 +29,6 @@ project( option(FIND_RMM_CPP "Search for existing RMM C++ installations before defaulting to local files" OFF) -option(RMM_BUILD_WHEELS "Whether this build is generating a Python wheel." OFF) # If the user requested it we attempt to find RMM. if(FIND_RMM_CPP) @@ -41,16 +40,9 @@ endif() if(NOT rmm_FOUND) set(BUILD_TESTS OFF) set(BUILD_BENCHMARKS OFF) + set(CUDA_STATIC_RUNTIME ON) - set(_exclude_from_all "") - if(RMM_BUILD_WHEELS) - # Statically link dependencies if building wheels - set(CUDA_STATIC_RUNTIME ON) - # Don't install the rmm C++ targets into wheels - set(_exclude_from_all EXCLUDE_FROM_ALL) - endif() - - add_subdirectory(../ rmm-cpp ${_exclude_from_all}) + add_subdirectory(../ rmm-cpp EXCLUDE_FROM_ALL) endif() include(rapids-cython)