Skip to content

Commit 3279aa8

Browse files
authored
Merge pull request rapidsai#4780 from bdice/branch-25.02-merge-24.12
Forward-merge branch-24.12 to branch-25.02
2 parents b84ac33 + 5f32ecf commit 3279aa8

File tree

375 files changed

+9312
-42189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

375 files changed

+9312
-42189
lines changed

.devcontainer/Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,3 @@ ENV SCCACHE_REGION="us-east-2"
3333
ENV SCCACHE_BUCKET="rapids-sccache-devs"
3434
ENV AWS_ROLE_ARN="arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs"
3535
ENV HISTFILE="/home/coder/.cache/._bash_history"
36-
37-
# cugraph_pyg's setup.py needs this defined when building in a conda env
38-
ENV CUDA_HOME="${CUDA_HOME:-/home/coder/.conda/envs/$DEFAULT_CONDA_ENV}"

.github/workflows/build.yaml

-19
Original file line numberDiff line numberDiff line change
@@ -113,22 +113,3 @@ jobs:
113113
sha: ${{ inputs.sha }}
114114
date: ${{ inputs.date }}
115115
package-name: cugraph
116-
wheel-build-cugraph-equivariant:
117-
secrets: inherit
118-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
119-
with:
120-
build_type: ${{ inputs.build_type || 'branch' }}
121-
branch: ${{ inputs.branch }}
122-
sha: ${{ inputs.sha }}
123-
date: ${{ inputs.date }}
124-
script: ci/build_wheel_cugraph-equivariant.sh
125-
wheel-publish-cugraph-equivariant:
126-
needs: wheel-build-cugraph-equivariant
127-
secrets: inherit
128-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
129-
with:
130-
build_type: ${{ inputs.build_type || 'branch' }}
131-
branch: ${{ inputs.branch }}
132-
sha: ${{ inputs.sha }}
133-
date: ${{ inputs.date }}
134-
package-name: cugraph-equivariant

.github/workflows/pr.yaml

-17
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
- wheel-tests-pylibcugraph
2626
- wheel-build-cugraph
2727
- wheel-tests-cugraph
28-
- wheel-build-cugraph-equivariant
29-
- wheel-tests-cugraph-equivariant
3028
- devcontainer
3129
secrets: inherit
3230
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
@@ -161,21 +159,6 @@ jobs:
161159
with:
162160
build_type: pull-request
163161
script: ci/test_wheel_cugraph.sh
164-
wheel-build-cugraph-equivariant:
165-
secrets: inherit
166-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
167-
with:
168-
build_type: pull-request
169-
script: ci/build_wheel_cugraph-equivariant.sh
170-
wheel-tests-cugraph-equivariant:
171-
needs: [wheel-build-cugraph-equivariant, changed-files]
172-
secrets: inherit
173-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
174-
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
175-
with:
176-
build_type: pull-request
177-
script: ci/test_wheel_cugraph-equivariant.sh
178-
matrix_filter: map(select(.ARCH == "amd64"))
179162
devcontainer:
180163
secrets: inherit
181164
uses: rapidsai/shared-workflows/.github/workflows/[email protected]

.github/workflows/test.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,3 @@ jobs:
5858
date: ${{ inputs.date }}
5959
sha: ${{ inputs.sha }}
6060
script: ci/test_wheel_cugraph.sh
61-
wheel-tests-cugraph-equivariant:
62-
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
64-
with:
65-
build_type: nightly
66-
branch: ${{ inputs.branch }}
67-
date: ${{ inputs.date }}
68-
sha: ${{ inputs.sha }}
69-
script: ci/test_wheel_cugraph-equivariant.sh
70-
matrix_filter: map(select(.ARCH == "amd64"))

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ datasets/*
7878
!datasets/karate-disjoint.csv
7979
!datasets/netscience.csv
8080

81-
# nx-cugraph side effects
82-
python/nx-cugraph/objects.inv
83-
8481
.pydevproject
8582

8683
# Jupyter Notebooks

.pre-commit-config.yaml

-21
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ repos:
1919
language_version: python3
2020
args: [--target-version=py310]
2121
files: ^(python/.*|benchmarks/.*)$
22-
exclude: ^python/nx-cugraph/
2322
- repo: https://github.com/PyCQA/flake8
2423
rev: 7.1.1
2524
hooks:
@@ -59,23 +58,3 @@ repos:
5958
hooks:
6059
- id: rapids-dependency-file-generator
6160
args: ["--clean"]
62-
- repo: local
63-
hooks:
64-
- id: nx-cugraph-meta-data-update
65-
name: nx-cugraph meta-data updater
66-
entry: bash -c "PYTHONPATH=./python/nx-cugraph python ./python/nx-cugraph/_nx_cugraph/__init__.py"
67-
files: ^python/nx-cugraph/
68-
types: [python]
69-
language: python
70-
pass_filenames: false
71-
additional_dependencies: ["networkx>=3.4"]
72-
- repo: local
73-
hooks:
74-
- id: nx-cugraph-readme-update
75-
name: nx-cugraph README updater
76-
entry: bash -c "PYTHONPATH=./python/nx-cugraph python ./python/nx-cugraph/scripts/update_readme.py ./python/nx-cugraph/README.md"
77-
files: ^python/nx-cugraph/
78-
types_or: [python, markdown]
79-
language: python
80-
pass_filenames: false
81-
additional_dependencies: ["networkx>=3.4"]

README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
-----
3838
## News
3939

40-
___NEW!___ _[nx-cugraph](./python/nx-cugraph/README.md)_, a NetworkX backend that provides GPU acceleration to NetworkX with zero code change.
40+
___NEW!___ _[nx-cugraph](https://rapids.ai/nx-cugraph/)_, a NetworkX backend that provides GPU acceleration to NetworkX with zero code change.
4141
```
4242
> pip install nx-cugraph-cu11 --extra-index-url https://pypi.nvidia.com
4343
> export NETWORKX_AUTOMATIC_BACKENDS=cugraph
@@ -62,9 +62,8 @@ That's it. NetworkX now leverages cuGraph for accelerated graph algorithms.
6262
- [External Data Types](./readme_pages/data_types.md)
6363
- [pylibcugraph](./readme_pages/pylibcugraph.md)
6464
- [libcugraph (C/C++/CUDA)](./readme_pages/libcugraph.md)
65-
- [nx-cugraph](./python/nx-cugraph/README.md)
65+
- [nx-cugraph](https://rapids.ai/nx-cugraph/)
6666
- [cugraph-service](./readme_pages/cugraph_service.md)
67-
- [cugraph-dgl](./readme_pages/cugraph_dgl.md)
6867
- [cugraph-ops](./readme_pages/cugraph_ops.md)
6968
- API Docs
7069
- Python
@@ -127,7 +126,7 @@ df_page.sort_values('pagerank', ascending=False).head(10)
127126
* ArangoDB - a free and open-source native multi-model database system - https://www.arangodb.com/
128127
* CuPy - "NumPy/SciPy-compatible Array Library for GPU-accelerated Computing with Python" - https://cupy.dev/
129128
* Memgraph - In-memory Graph database - https://memgraph.com/
130-
* NetworkX (via [nx-cugraph](./python/nx-cugraph/README.md) backend) - an extremely popular, free and open-source package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks - https://networkx.org/
129+
* NetworkX (via [nx-cugraph](https://rapids.ai/nx-cugraph/) backend) - an extremely popular, free and open-source package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks - https://networkx.org/
131130
* PyGraphistry - free and open-source GPU graph ETL, AI, and visualization, including native RAPIDS & cuGraph support - http://github.com/graphistry/pygraphistry
132131
* ScanPy - a scalable toolkit for analyzing single-cell gene expression data - https://scanpy.readthedocs.io/en/stable/
133132

benchmarks/nx-cugraph/pytest-based/README.md

-49
This file was deleted.

0 commit comments

Comments
 (0)