From b981d7f538a890335ec7ef3bc29e87b818211276 Mon Sep 17 00:00:00 2001
From: Simon Adorf <sadorf@nvidia.com>
Date: Thu, 21 May 2026 20:21:54 +0000
Subject: [PATCH 1/2] Add nvforest to cuML devcontainer dependencies

---
 .../src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b0edd85d..942c896b 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
@@ -194,7 +194,7 @@ repos:
     cpp:
       - name: cuml
         sub_dir: cpp
-        depends: [rmm, raft, cuvs]
+        depends: [rmm, raft, cuvs, nvforest]
         parallelism:
           max_device_obj_memory_usage: 3Gi
         test: ci/run_ctests.sh

From 59e58be0cd697675120e8dab93a1d0fc41ddfc6a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 22 May 2026 10:22:02 -0700
Subject: [PATCH 2/2] move nvforest before cuml and bump feature version

---
 .../devcontainer-feature.json                 |  2 +-
 .../opt/rapids-build-utils/manifest.yaml      | 44 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index 0bc3cc4b..da5e6885 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": "26.6.1",
+  "version": "26.6.2",
   "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 942c896b..7a6f2565 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
@@ -186,28 +186,6 @@ repos:
         depends: [cuvs]
         args: {install: *rapids_build_backend_args}
         test: ci/run_cuvs_pytests.sh
-  - name: cuml
-    path: cuml
-    git: {!!merge <<: *git_defaults, repo: cuml}
-    dependency_keys:
-      - devcontainers
-    cpp:
-      - name: cuml
-        sub_dir: cpp
-        depends: [rmm, raft, cuvs, nvforest]
-        parallelism:
-          max_device_obj_memory_usage: 3Gi
-        test: ci/run_ctests.sh
-    python:
-      - name: libcuml
-        sub_dir: python/libcuml
-        depends: [cuml]
-        args: {install: *rapids_build_backend_args}
-      - name: cuml
-        sub_dir: python/cuml
-        depends: [cuml]
-        args: {install: *rapids_build_backend_args}
-        test: ci/run_cuml_singlegpu_pytests.sh
   - name: nvforest
     path: nvforest
     git: {!!merge <<: *git_defaults, repo: nvforest}
@@ -230,6 +208,28 @@ repos:
         depends: [nvforest]
         args: {install: *rapids_build_backend_args}
         test: ci/run_nvforest_pytests.sh
+  - name: cuml
+    path: cuml
+    git: {!!merge <<: *git_defaults, repo: cuml}
+    dependency_keys:
+      - devcontainers
+    cpp:
+      - name: cuml
+        sub_dir: cpp
+        depends: [rmm, raft, cuvs, nvforest]
+        parallelism:
+          max_device_obj_memory_usage: 3Gi
+        test: ci/run_ctests.sh
+    python:
+      - name: libcuml
+        sub_dir: python/libcuml
+        depends: [cuml]
+        args: {install: *rapids_build_backend_args}
+      - name: cuml
+        sub_dir: python/cuml
+        depends: [cuml]
+        args: {install: *rapids_build_backend_args}
+        test: ci/run_cuml_singlegpu_pytests.sh
   - name: cugraph
     path: cugraph
     git: {!!merge <<: *git_defaults, repo: cugraph}