Merge branch 'branch-24.12' of github.com:rapidsai/devcontainers into…

… branch-25.02
rapidsai · Nov 26, 2024 · 25dcd07 · 25dcd07
2 parents a2f7efd + c261d7b
commit 25dcd07
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git 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.0",
+  "version": "25.2.1",
   "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
@@ -187,21 +187,6 @@ repos:
         cmake: -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
         install: *rapids_build_backend_args
 
-- name: wholegraph
-  path: wholegraph
-  git: {<<: *git_defaults, repo: wholegraph}
-  cpp:
-    - name: wholegraph
-      sub_dir: cpp
-      depends: [raft]
-      args:
-        cmake: -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
-  python:
-    - name: wholegraph
-      sub_dir: python/pylibwholegraph
-      depends: [wholegraph]
-      args: {install: *rapids_build_backend_args}
-
 - name: cugraph
   path: cugraph
   git: {<<: *git_defaults, repo: cugraph}
@@ -224,23 +209,40 @@ repos:
       sub_dir: python/cugraph
       depends: [cugraph]
       args: {cmake: -DFIND_CUGRAPH_CPP=ON, install: *rapids_build_backend_args}
-    - name: nx-cugraph
-      sub_dir: python/nx-cugraph
+    - name: cugraph-service-client
+      sub_dir: python/cugraph-service/client
+      args: {install: *rapids_build_backend_args}
+    - name: cugraph-service-server
+      sub_dir: python/cugraph-service/server
+      args: {install: *rapids_build_backend_args}
+
+- name: cugraph-gnn
+  path: cugraph-gnn
+  git: {<<: *git_defaults, repo: cugraph-gnn}
+  cpp:
+    - name: wholegraph
+      sub_dir: cpp
+      depends: [raft]
+      args:
+        cmake: -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
+  python:
+    - name: wholegraph
+      sub_dir: python/pylibwholegraph
+      depends: [wholegraph]
       args: {install: *rapids_build_backend_args}
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
       args: {install: *rapids_build_backend_args}
-    - name: cugraph-equivariant
-      sub_dir: python/cugraph-equivariant
-      args: {install: *rapids_build_backend_args}
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
       args: {install: *rapids_build_backend_args}
-    - name: cugraph-service-client
-      sub_dir: python/cugraph-service/client
-      args: {install: *rapids_build_backend_args}
-    - name: cugraph-service-server
-      sub_dir: python/cugraph-service/server
+
+- name: nx-cugraph
+  path: nx-cugraph
+  git: {<<: *git_defaults, repo: nx-cugraph}
+  python:
+    - name: nx-cugraph
+      sub_dir: .
       args: {install: *rapids_build_backend_args}
 
 - name: cuspatial