From 9ab53a6bbeac571d48927ea8e890f4ecc6c659f8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 12 Nov 2024 15:12:50 -0600 Subject: [PATCH 1/9] move nx-cugraph out of 'cugraph' repo for 24.12 --- .../src/rapids-build-utils/devcontainer-feature.json | 2 +- .../opt/rapids-build-utils/manifest.yaml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 7888b995..703793c6 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": "24.12.2", + "version": "24.12.3", "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 c54c4612..b8434646 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 @@ -224,9 +224,6 @@ 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 - args: {install: *rapids_build_backend_args} - name: cugraph-dgl sub_dir: python/cugraph-dgl args: {install: *rapids_build_backend_args} @@ -243,6 +240,14 @@ repos: sub_dir: python/cugraph-service/server args: {install: *rapids_build_backend_args} +- 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 path: cuspatial git: {<<: *git_defaults, repo: cuspatial} From 974f77fe64f1eac25c1fcf18a13111b422f29b96 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 13 Nov 2024 08:41:27 -0600 Subject: [PATCH 2/9] add GNN packages --- .../opt/rapids-build-utils/manifest.yaml | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 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 index b8434646..42c5be1e 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 @@ -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,9 +209,6 @@ repos: sub_dir: python/cugraph depends: [cugraph] args: {cmake: -DFIND_CUGRAPH_CPP=ON, 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} @@ -240,6 +222,27 @@ repos: 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_pyg + sub_dir: python/cugraph-pyg + args: {install: *rapids_build_backend_args} + - name: nx-cugraph path: nx-cugraph git: {<<: *git_defaults, repo: nx-cugraph} From 4b23b15b51d34a7a594eb7a187ad695d250afcce Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 13 Nov 2024 09:19:58 -0600 Subject: [PATCH 3/9] temporarily build from a different branch of cugraph-gnn --- .../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 42c5be1e..c0a99af2 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 @@ -224,7 +224,7 @@ repos: - name: cugraph-gnn path: cugraph-gnn - git: {<<: *git_defaults, repo: cugraph-gnn} + git: {<<: *git_defaults, repo: cugraph-gnn, branch: devcontainers} cpp: - name: wholegraph sub_dir: cpp From 18224c542484621771e8c5f20a9be2d5b740f9d4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 13 Nov 2024 11:32:28 -0600 Subject: [PATCH 4/9] try more repo customization --- .../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 c0a99af2..7a3cf6fe 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 @@ -224,7 +224,7 @@ repos: - name: cugraph-gnn path: cugraph-gnn - git: {<<: *git_defaults, repo: cugraph-gnn, branch: devcontainers} + git: {host: github, upstream: jameslamb, repo: cugraph-gnn, tag: devcontainers} cpp: - name: wholegraph sub_dir: cpp From 17192b04d6a2db25e8f4c1d31675445418589b94 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 13 Nov 2024 18:55:02 -0600 Subject: [PATCH 5/9] try more CI fixes --- .../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 7a3cf6fe..6873629a 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 @@ -102,7 +102,7 @@ repos: - name: raft path: raft - git: {<<: *git_defaults, repo: raft} + git: {host: github, upstream: jameslamb, repo: raft, tag: wheel-validation} cpp: - name: raft sub_dir: cpp From 861d75ac9421debabd782b28db53586bcf0aa6f8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 14 Nov 2024 09:56:06 -0600 Subject: [PATCH 6/9] remove testing-only patch for raft --- .../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 6873629a..7a3cf6fe 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 @@ -102,7 +102,7 @@ repos: - name: raft path: raft - git: {host: github, upstream: jameslamb, repo: raft, tag: wheel-validation} + git: {<<: *git_defaults, repo: raft} cpp: - name: raft sub_dir: cpp From 2c5837dc10a4543833c059ecf717a8c5116b65c4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 15 Nov 2024 08:58:03 -0600 Subject: [PATCH 7/9] move pyg, remove cugraph-equivariant --- .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 6 ------ 1 file changed, 6 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 index 7a3cf6fe..24ffcf67 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 @@ -209,12 +209,6 @@ repos: sub_dir: python/cugraph depends: [cugraph] args: {cmake: -DFIND_CUGRAPH_CPP=ON, 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} From 812e245ceb7c7287d6f7c43c7c1313d4b6c80bd1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 15 Nov 2024 09:31:07 -0600 Subject: [PATCH 8/9] bump version again --- features/src/rapids-build-utils/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json index 703793c6..3e9258cb 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": "24.12.3", + "version": "24.12.4", "description": "A feature to install the RAPIDS devcontainer build utilities", "containerEnv": { "BASH_ENV": "/etc/bash.bash_env" From 58161d68d814d9681c923632a62deb140a05d815 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 18 Nov 2024 15:21:34 -0500 Subject: [PATCH 9/9] Use branch-24.12 again --- .../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 24ffcf67..05fc7acc 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 @@ -218,7 +218,7 @@ repos: - name: cugraph-gnn path: cugraph-gnn - git: {host: github, upstream: jameslamb, repo: cugraph-gnn, tag: devcontainers} + git: {<<: *git_defaults, repo: cugraph-gnn} cpp: - name: wholegraph sub_dir: cpp