Merge branch 'branch-25.02' into libcuml-wheels

rapidsai · Jan 23, 2025 · 0b8b257 · 0b8b257
2 parents 9e1e0fe + 2e52c80
commit 0b8b257
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
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
@@ -132,10 +132,14 @@ repos:
         max_device_obj_memory_usage: 3Gi
       args: {cmake: -DBUILD_C_LIBRARY=ON}
   python:
+    - name: libcuvs
+      sub_dir: python/libcuvs
+      depends: [cuvs]
+      args: {install: *rapids_build_backend_args}
     - name: cuvs
       sub_dir: python/cuvs
       depends: [cuvs]
-      args: {cmake: -DFIND_CUVS_CPP=ON, install: *rapids_build_backend_args}
+      args: {install: *rapids_build_backend_args}
 
 - name: cumlprims_mg
   path: cumlprims_mg

diff --git a/features/src/ucx/devcontainer-feature.json b/features/src/ucx/devcontainer-feature.json
@@ -8,6 +8,7 @@
       "type": "string",
       "proposals": [
         "latest",
+        "1.18.0",
         "1.17.0",
         "1.16.0",
         "1.15.0",

diff --git a/matrix.yml b/matrix.yml
@@ -37,7 +37,7 @@ x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" }
 
 x-mambaforge: &conda { name: "mambaforge" }
 x-python: &python { name: "ghcr.io/devcontainers/features/python:1.6.2", version: "os-provided", installTools: "false", hide: true }
-x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.17.0" }
+x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.18.0" }
 x-openmpi: &openmpi { name: "openmpi" }
 
 x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true }