Skip to content

move cugraph projects around for 24.12 #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdice merged 10 commits into from
Nov 19, 2024
Merged

move cugraph projects around for 24.12 #417

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ab53a6
move nx-cugraph out of 'cugraph' repo for 24.12
jameslamb Nov 12, 2024
974f77f
add GNN packages
jameslamb Nov 13, 2024
4b23b15
temporarily build from a different branch of cugraph-gnn
jameslamb Nov 13, 2024
18224c5
try more repo customization
jameslamb Nov 13, 2024
17192b0
try more CI fixes
jameslamb Nov 14, 2024
861d75a
remove testing-only patch for raft
jameslamb Nov 14, 2024
2c5837d
move pyg, remove cugraph-equivariant
jameslamb Nov 15, 2024
a90d36f
merge branch-24.12
jameslamb Nov 15, 2024
812e245
bump version again
jameslamb Nov 15, 2024
58161d6
Use branch-24.12 again
KyleFromNVIDIA Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
52 changes: 30 additions & 22 deletions features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ repos:

- name: raft
path: raft
git: {<<: *git_defaults, repo: raft}
git: {host: github, upstream: jameslamb, repo: raft, tag: wheel-validation}
Comment thread
jameslamb marked this conversation as resolved.
Outdated
cpp:
- name: raft
sub_dir: cpp
Expand Down Expand Up @@ -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}
Expand All @@ -224,12 +209,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}
- name: cugraph-equivariant
sub_dir: python/cugraph-equivariant
args: {install: *rapids_build_backend_args}
Expand All @@ -243,6 +222,35 @@ repos:
sub_dir: python/cugraph-service/server
args: {install: *rapids_build_backend_args}

- name: cugraph-gnn
path: cugraph-gnn
git: {host: github, upstream: jameslamb, repo: cugraph-gnn, tag: devcontainers}

@jameslamb jameslamb Nov 14, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing this to test changes in rapidsai/cugraph-gnn#68

It should be pointed at the real upstream repo after that PR is merged.

@jameslamb jameslamb Nov 14, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks to me like the changes in rapidsai/cugraph-gnn#68 did resolve the conda solve issues I was seeing before.

Now CI is failing here with what looks like a cuVS issues that's being fixed upstream: #418 (comment)

@jameslamb jameslamb Nov 14, 2024 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now this is failing when compiling RAFT:

/home/coder/raft/cpp/bench/ann/src/faiss/faiss_gpu_wrapper.h(229): error: class "faiss::gpu::StandardGpuResources" has no member "getRaftHandle"

/home/coder/raft/cpp/bench/ann/src/faiss/faiss_gpu_wrapper.h(231): error: class "faiss::gpu::StandardGpuResources" has no member "getRaftHandle"

/home/coder/raft/cpp/bench/ann/src/faiss/faiss_gpu_wrapper.h(246): error: class "faiss::gpu::StandardGpuResources" has no member "getRaftHandle"

/home/coder/raft/cpp/bench/ann/src/faiss/faiss_gpu_wrapper.h(328): error: class "faiss::gpu::GpuIndexIVFFlatConfig" has no member "use_raft"

/home/coder/raft/cpp/bench/ann/src/faiss/faiss_gpu_wrapper.h(372): error: class "faiss::gpu::GpuIndexIVFPQConfig" has no member "use_raft"

5 errors detected in the compilation of "/home/coder/raft/cpp/bench/ann/src/faiss/faiss_gpu_benchmark.cu".

(build link)

Maybe a result of facebookresearch/faiss#3549 being merged 2 hours ago?

@tarang-jain can you take a look?

@jameslamb jameslamb Nov 14, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR to hopefully fix the RAFT issue: NVIDIA/raft#2496

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}
python:
- name: nx-cugraph
sub_dir: .
args: {install: *rapids_build_backend_args}

- name: cuspatial
path: cuspatial
git: {<<: *git_defaults, repo: cuspatial}
Expand Down