diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 9b052a84e..3a59ab481 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -16,7 +16,7 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" cd "${package_dir}" # Hardcode the output dir -SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DBUILD_SHARED_LIBS=OFF;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-DCUDA_STATIC_RUNTIME=ON;-DCUDA_STATIC_MATH_LIBRARIES=ON;-DWHOLEGRAPH_BUILD_WHEELS=ON" \ +SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DBUILD_SHARED_LIBS=OFF;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-DCUDA_STATIC_RUNTIME=ON;-DWHOLEGRAPH_BUILD_WHEELS=ON" \ python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check mkdir -p final_dist diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index f1ea4fd78..9c364b0f6 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -51,8 +51,7 @@ rapids_cmake_write_version_file(include/wholegraph/version_config.hpp) option(BUILD_SHARED_LIBS "Build libwholegraph shared libraries" ON) option(CMAKE_CUDA_LINEINFO "Enable the -lineinfo option for nvcc (useful for cuda-memcheck / profiler" OFF) option(BUILD_TESTS "Configure CMake to build tests" ON) -option(CUDA_STATIC_RUNTIME "Statically link the CUDA runtime" OFF) -option(CUDA_STATIC_MATH_LIBRARIES "Statically link the CUDA math libraries" OFF) +option(CUDA_STATIC_RUNTIME "Statically link the CUDA toolkit runtime and libraries" OFF) option(BUILD_WITH_NVSHMEM "Enable nvshmem integration" OFF) option(WHOLEGRAPH_EXCLUDE_NVSHMEM_FROM_ALL "Exclude nvshmem targets from wholeGraph's 'all' target" ON) option(BUILD_BENCHMARKS "Configure CMake to build benchmark" ON) @@ -60,7 +59,7 @@ option(BUILD_BENCHMARKS "Configure CMake to build benchmark" ON) ############################################################################## # - Set options based on user defined one ----------------------------------- set(_ctk_static_suffix "") -if(CUDA_STATIC_MATH_LIBRARIES) +if(CUDA_STATIC_RUNTIME) set(_ctk_static_suffix "_static") endif()