use newer raft packages

rapidsai · Jan 10, 2025 · e7a2291 · e7a2291
1 parent cce3e86
commit e7a2291
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,7 @@ dask-worker-space/
 htmlcov
 *.conda
 dist/
-.egg-info/
+*.egg-info/
 python/build
 python/cugraph/bindings/*.cpp
 wheels/

diff --git a/ci/build_wheel_cugraph.sh b/ci/build_wheel_cugraph.sh
@@ -24,16 +24,7 @@ EOF
 # are used when creating the isolated build environment.
 export PIP_CONSTRAINT="${PWD}/constraints.txt"
 
-case "${RAPIDS_CUDA_VERSION}" in
-  12.*)
-    EXTRA_CMAKE_ARGS=";-DUSE_CUDA_MATH_WHEELS=ON"
-  ;;
-  11.*)
-    EXTRA_CMAKE_ARGS=";-DUSE_CUDA_MATH_WHEELS=OFF"
-  ;;
-esac
-
-export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF${EXTRA_CMAKE_ARGS}"
+export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF"
 
 ./ci/build_wheel.sh cugraph ${package_dir} python
 ./ci/validate_wheel.sh ${package_dir} final_dist
diff --git a/ci/build_wheel_pylibcugraph.sh b/ci/build_wheel_pylibcugraph.sh
@@ -22,19 +22,7 @@ EOF
 # are used when creating the isolated build environment.
 export PIP_CONSTRAINT="${PWD}/constraints.txt"
 
-PARALLEL_LEVEL=$(python -c \
-  "from math import ceil; from multiprocessing import cpu_count; print(ceil(cpu_count()/4))")
-
-case "${RAPIDS_CUDA_VERSION}" in
-  12.*)
-    EXTRA_CMAKE_ARGS=";-DUSE_CUDA_MATH_WHEELS=ON"
-  ;;
-  11.*)
-    EXTRA_CMAKE_ARGS=";-DUSE_CUDA_MATH_WHEELS=OFF"
-  ;;
-esac
-
-export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF${EXTRA_CMAKE_ARGS}"
+export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF"
 
 ./ci/build_wheel.sh pylibcugraph ${package_dir} python
 ./ci/validate_wheel.sh ${package_dir} final_dist
diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh
@@ -1,7 +1,7 @@
 # Copyright (c) 2025, NVIDIA CORPORATION.
 # TODO(jameslamb): remove this file when https://github.com/rapidsai/raft/pull/2531 is merged
 
-RAFT_COMMIT="345f0e556b602ec65b5eebe825ffd000d61706fe"
+RAFT_COMMIT="76d788bfb688335e9d0fab3ee83afc71a1599a7c"
 
 RAFT_CPP_CHANNEL=$(rapids-get-pr-conda-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}")
 RAFT_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact raft 2531 python "${RAFT_COMMIT:0:7}")

diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh
@@ -3,7 +3,7 @@
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-RAFT_COMMIT="345f0e556b602ec65b5eebe825ffd000d61706fe"
+RAFT_COMMIT="76d788bfb688335e9d0fab3ee83afc71a1599a7c"
 LIBRAFT_CHANNEL=$(
   RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}"
 )

diff --git a/python/libcugraph/CMakeLists.txt b/python/libcugraph/CMakeLists.txt
@@ -34,7 +34,7 @@ endif()
 
 unset(cugraph_FOUND)
 
-# --- CUDA libraries -- #
+# --- CUDA -- #
 find_package(CUDAToolkit REQUIRED)
 set(CUDA_STATIC_RUNTIME ON)
 set(CUDA_STATIC_MATH_LIBRARIES ON)