Skip to content

Commit 050b66d

Browse files
authored
Use new rapids-logger library (#364)
ucxx only needs minor changes here to adapt for the upstream rmm changes. Contributes to rapidsai/build-planning#104. Authors: - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Peter Andreas Entschev (https://github.com/pentschev) - Bradley Dice (https://github.com/bdice) - James Lamb (https://github.com/jameslamb) URL: #364
1 parent 8eae4f7 commit 050b66d

9 files changed

+15
-15
lines changed

ci/build_wheel_libucxx.sh

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export SKBUILD_CMAKE_ARGS="-DUCXX_ENABLE_RMM=ON"
3434
mkdir -p "${package_dir}/final_dist"
3535
python -m auditwheel repair \
3636
--exclude "libucp.so.0" \
37+
--exclude librapids_logger.so \
3738
-w "${package_dir}/final_dist" \
3839
${package_dir}/dist/*
3940

ci/build_wheel_ucxx.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2024-2025, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

@@ -25,6 +25,7 @@ mkdir -p "${package_dir}/final_dist"
2525
python -m auditwheel repair \
2626
--exclude "libucp.so.0" \
2727
--exclude "libucxx.so" \
28+
--exclude librapids_logger.so \
2829
-w "${package_dir}/final_dist" \
2930
${package_dir}/dist/*
3031

conda/environments/all_cuda-118_arch-x86_64.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dependencies:
2121
- dask-cuda==25.4.*,>=0.0.0a0
2222
- dask-cudf==25.4.*,>=0.0.0a0
2323
- doxygen=1.9.1
24-
- fmt>=11.0.2,<12
2524
- librmm==25.4.*,>=0.0.0a0
2625
- libtool
2726
- ninja
@@ -40,6 +39,5 @@ dependencies:
4039
- rmm==25.4.*,>=0.0.0a0
4140
- scikit-build-core>=0.10.0
4241
- setuptools>=64.0.0
43-
- spdlog>=1.14.1,<1.15
4442
- ucx>=1.15.0,<1.19
4543
name: all_cuda-118_arch-x86_64

conda/environments/all_cuda-128_arch-x86_64.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ dependencies:
1313
- cloudpickle
1414
- cmake>=3.26.4,!=3.30.0
1515
- cuda-cudart-dev
16+
- cuda-nvcc
1617
- cuda-version=12.8
1718
- cudf==25.4.*,>=0.0.0a0
1819
- cupy>=12.0.0
@@ -21,7 +22,6 @@ dependencies:
2122
- dask-cuda==25.4.*,>=0.0.0a0
2223
- dask-cudf==25.4.*,>=0.0.0a0
2324
- doxygen=1.9.1
24-
- fmt>=11.0.2,<12
2525
- librmm==25.4.*,>=0.0.0a0
2626
- libtool
2727
- ninja
@@ -40,6 +40,5 @@ dependencies:
4040
- rmm==25.4.*,>=0.0.0a0
4141
- scikit-build-core>=0.10.0
4242
- setuptools>=64.0.0
43-
- spdlog>=1.14.1,<1.15
4443
- ucx>=1.15.0,<1.19
4544
name: all_cuda-128_arch-x86_64

cpp/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# =================================================================================
2-
# SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
2+
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES.
33
# SPDX-License-Identifier: BSD 3-Clause License
44
# =================================================================================
55

@@ -192,7 +192,7 @@ if(UCXX_ENABLE_RMM)
192192
)
193193

194194
# Define spdlog level
195-
target_compile_definitions(ucxx PUBLIC UCXX_ENABLE_RMM "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${RMM_LOGGING_LEVEL}")
195+
target_compile_definitions(ucxx PUBLIC UCXX_ENABLE_RMM "RMM_LOG_ACTIVE_LEVEL=RAPIDS_LOGGER_LEVEL_${RMM_LOGGING_LEVEL}")
196196
endif()
197197

198198
# Specify the target module library dependencies

cpp/python/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ======================================================================================================
2-
# SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-FileCopyrightText: Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: BSD 3-Clause License
44
# ======================================================================================================
55

@@ -118,9 +118,7 @@ target_compile_definitions(
118118
ucxx_python PUBLIC "$<$<COMPILE_LANGUAGE:CXX>:${UCXX_CXX_DEFINITIONS}>"
119119
)
120120

121-
target_compile_definitions(ucxx_python PUBLIC UCXX_ENABLE_PYTHON)
122-
# Define spdlog level
123-
target_compile_definitions(ucxx_python PUBLIC "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${RMM_LOGGING_LEVEL}")
121+
target_compile_definitions(ucxx_python PUBLIC UCXX_ENABLE_PYTHON "RMM_LOG_ACTIVE_LEVEL=RAPIDS_LOGGER_LEVEL_${RMM_LOGGING_LEVEL}")
124122

125123
# Specify the target module library dependencies
126124
target_link_libraries(

dependencies.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ files:
7979
extras:
8080
table: project
8181
includes:
82+
- depends_on_librmm
8283
- depends_on_ucx_run
8384
py_build_ucxx:
8485
output: pyproject
@@ -156,10 +157,8 @@ dependencies:
156157
- c-compiler
157158
- cxx-compiler
158159
- &cmake_ver cmake>=3.26.4,!=3.30.0
159-
- fmt>=11.0.2,<12
160160
- librmm==25.4.*,>=0.0.0a0
161161
- ninja
162-
- spdlog>=1.14.1,<1.15
163162
- output_types: [requirements, pyproject]
164163
packages:
165164
- *cmake_ver
@@ -241,6 +240,7 @@ dependencies:
241240
cuda: "12.*"
242241
packages:
243242
- cuda-cudart-dev
243+
- cuda-nvcc
244244
dev:
245245
common:
246246
- output_types: [conda]

python/libucxx/libucxx/load.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2024, NVIDIA CORPORATION.
1+
# Copyright (c) 2024-2025, NVIDIA CORPORATION.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -48,10 +48,12 @@ def load_library():
4848
# symbols. Otherwise, we assume that the library was installed in a system path
4949
# that ld can find.
5050
try:
51+
import librmm
5152
import libucx
5253
except ModuleNotFoundError:
5354
pass
5455
else:
56+
librmm.load_library()
5557
libucx.load_library()
5658
del libucx
5759

python/libucxx/pyproject.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
1+
# Copyright (c) 2024-2025, NVIDIA CORPORATION. All rights reserved.
22
# See file LICENSE for terms.
33

44
[build-system]
@@ -29,6 +29,7 @@ classifiers = [
2929
"Programming Language :: Python :: 3",
3030
]
3131
dependencies = [
32+
"librmm==25.4.*,>=0.0.0a0",
3233
"libucx>=1.15.0,<1.19",
3334
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
3435

0 commit comments

Comments
 (0)