From 38d7e3948bde7b8030e09ce3e830f393e7d649d6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 23 Jan 2025 16:16:21 -0600 Subject: [PATCH 1/2] add libcuml Python builds (#442) Contributes to https://github.com/rapidsai/build-planning/issues/33 Adjusts `rapids-build-utils` manifest for release 25.02 to account for the introduction of new `libcuml` wheels (https://github.com/rapidsai/cuml/pull/6199). ## Notes for Reviewers This shouldn't be merged still pointing at my forks. Plan: 1. merge https://github.com/rapidsai/devcontainers/pull/440, then update this branch 2. see CI pass here 3. see all CI except devcontainers pass on https://github.com/rapidsai/cuml/pull/6199 4. point this PR back at upstream and admin-merge it 5. re-run devcontainers CI on https://github.com/rapidsai/cuml/pull/6199 and see it pass --- features/src/rapids-build-utils/devcontainer-feature.json | 2 +- .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index b8807951..c8e46f19 100644 --- a/features/src/rapids-build-utils/devcontainer-feature.json +++ b/features/src/rapids-build-utils/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "NVIDIA RAPIDS devcontainer build utilities", "id": "rapids-build-utils", - "version": "25.2.7", + "version": "25.2.8", "description": "A feature to install the RAPIDS devcontainer build utilities", "containerEnv": { "BASH_ENV": "/etc/bash.bash_env" diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml index 821fcbf2..a259304c 100755 --- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml +++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml @@ -159,10 +159,14 @@ repos: parallelism: max_device_obj_memory_usage: 3Gi python: + - name: libcuml + sub_dir: python/libcuml + depends: [cuml] + args: {install: *rapids_build_backend_args} - name: cuml sub_dir: python/cuml depends: [cuml] - args: {cmake: -DFIND_CUML_CPP=ON, install: *rapids_build_backend_args} + args: {install: *rapids_build_backend_args} - name: cugraph path: cugraph From 011fcae5432c83c5223beab5a3a32eacc919d1bd Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 23 Jan 2025 16:16:49 -0600 Subject: [PATCH 2/2] use UCX 1.18.0 in pip devcontainers (#443) Contributes to https://github.com/rapidsai/build-planning/issues/138 Follow-up to #441 --- .devcontainer/cuda11.8-pip/devcontainer.json | 2 +- .devcontainer/cuda12.0-pip/devcontainer.json | 2 +- .devcontainer/cuda12.2-pip/devcontainer.json | 2 +- .devcontainer/cuda12.5-pip/devcontainer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json index 49f2eedc..eb71dd64 100644 --- a/.devcontainer/cuda11.8-pip/devcontainer.json +++ b/.devcontainer/cuda11.8-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "11.8", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ucx1.17.0-openmpi-ubuntu22.04" + "BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04" } }, "runArgs": [ diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json index 20fcb4ca..501a5eab 100644 --- a/.devcontainer/cuda12.0-pip/devcontainer.json +++ b/.devcontainer/cuda12.0-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "12.0", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.0-ucx1.17.0-openmpi-ubuntu22.04" + "BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.0-ucx1.18.0-openmpi-ubuntu22.04" } }, "runArgs": [ diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json index 758bf5cd..4d4bac2a 100644 --- a/.devcontainer/cuda12.2-pip/devcontainer.json +++ b/.devcontainer/cuda12.2-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "12.2", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.2-ucx1.17.0-openmpi-ubuntu22.04" + "BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.2-ucx1.18.0-openmpi-ubuntu22.04" } }, "runArgs": [ diff --git a/.devcontainer/cuda12.5-pip/devcontainer.json b/.devcontainer/cuda12.5-pip/devcontainer.json index a518c8fd..dbb72617 100644 --- a/.devcontainer/cuda12.5-pip/devcontainer.json +++ b/.devcontainer/cuda12.5-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "12.5", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.5-ucx1.17.0-openmpi-ubuntu22.04" + "BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.5-ucx1.18.0-openmpi-ubuntu22.04" } }, "runArgs": [