Skip to content

Commit a864650

Browse files
authored
Downgrade to raft 25.02 (#752)
RMM has recently moved away from header only operation in rapidsai/rmm#1896, which complicates the wheel deployment here since we need to bring in a librmm.so. Temporarily downgrade to raft/rmm v25.02 which doesn't require a precompiled librmm.so or librapids_logger.so
1 parent 24255ac commit a864650

4 files changed

Lines changed: 14 additions & 11 deletions

File tree

implicit/gpu/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ else()
1616
add_compile_options(-DCCCL_IGNORE_DEPRECATED_STREAM_REF_HEADER)
1717

1818
# use rapids-cmake to install dependencies
19-
set(rapids-cmake-version "26.02")
20-
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/refs/heads/release/26.02/RAPIDS.cmake
19+
set(rapids-cmake-version "25.02")
20+
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/refs/heads/branch-25.02/RAPIDS.cmake
2121
${CMAKE_BINARY_DIR}/RAPIDS.cmake)
2222
include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
2323
include(rapids-cmake)
@@ -37,11 +37,11 @@ else()
3737
include(${rapids-cmake-dir}/cpm/rmm.cmake)
3838
rapids_cpm_rmm()
3939

40-
rapids_cpm_find(raft 26.02
40+
rapids_cpm_find(raft 25.02
4141
GLOBAL_TARGETS raft::raft
4242
CPM_ARGS
4343
GIT_REPOSITORY https://github.com/rapidsai/raft.git
44-
GIT_TAG v26.02.00
44+
GIT_TAG v25.02.00
4545
SOURCE_SUBDIR cpp
4646
OPTIONS
4747
"BUILD_TESTS OFF"

implicit/gpu/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from __future__ import absolute_import
22

3+
import warnings
4+
35
HAS_CUDA = False
46
try:
57
from ._cuda import * # noqa
@@ -8,10 +10,10 @@
810
HAS_CUDA = True
911

1012
except RuntimeError as e:
11-
import warnings
12-
1313
warnings.warn(
1414
f"CUDA extension is built, but disabling GPU support because of '{e}'",
1515
)
16-
except ImportError:
17-
pass
16+
except ImportError as e:
17+
warnings.warn(
18+
f"Disabling GPU support because of '{e}'",
19+
)

implicit/gpu/knn.cu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <cub/device/device_segmented_radix_sort.cuh>
66
#include <cuda_runtime.h>
77
#include <rmm/cuda_stream_view.hpp>
8-
#include <rmm/mr/cuda_memory_resource.hpp>
9-
#include <rmm/mr/device_memory_resource.hpp>
10-
#include <rmm/mr/pool_memory_resource.hpp>
8+
#include <rmm/mr/device/cuda_memory_resource.hpp>
9+
#include <rmm/mr/device/device_memory_resource.hpp>
10+
#include <rmm/mr/device/pool_memory_resource.hpp>
1111
#include <thrust/device_ptr.h>
1212
#include <thrust/functional.h>
1313
#include <thrust/iterator/constant_iterator.h>

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies = ["numpy>=1.17.0", "scipy>=0.16", "tqdm>=4.27", "threadpoolctl"]
3535
wheel.exclude = ["**.pyx", "**.cmake", "**.cuh", "**.hpp", "**.h", "**.hpp.in"]
3636
cmake.version = ">=3.21.0"
3737
ninja.version = ">=1.10"
38+
build-dir = "build"
3839

3940
[tool.cibuildwheel]
4041
# skip testing in the cibuildwheel phase, will install the wheels later

0 commit comments

Comments
 (0)