Skip to content

Commit

Permalink
Merge branch 'branch-24.12' into dgl-linkpred
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbarghi-nv authored Oct 18, 2024
2 parents 94e93d2 + 93e61a7 commit f66383d
Show file tree
Hide file tree
Showing 16 changed files with 209 additions and 112 deletions.
4 changes: 4 additions & 0 deletions .github/copy-pr-bot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Configuration file for `copy-pr-bot` GitHub App
# https://docs.gha-runners.nvidia.com/apps/copy-pr-bot/

enabled: true
9 changes: 9 additions & 0 deletions .github/ops-bot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file controls which features from the `ops-bot` repository below are enabled.
# - https://github.com/rapidsai/ops-bot

auto_merger: true
branch_checker: true
label_checker: true
release_drafter: true
recently_updated: true
forward_merger: true
56 changes: 56 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: pr

on:
push:
branches:
- "pull-request/[0-9]+"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
pr-builder:
needs:
- changed-files
- checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
if: always()
with:
needs: ${{ toJSON(needs) }}
changed-files:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
files_yaml: |
test_cpp:
- '**'
- '!.devcontainers/**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!docs/**'
- '!img/**'
- '!mg_utils/**'
- '!notebooks/**'
- '!python/**'
- '!readme_pages/**'
test_notebooks:
- '**'
- '!.devcontainers/**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!docs/**'
test_python:
- '**'
- '!.devcontainers/**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!docs/**'
- '!img/**'
- '!notebooks/**'
checks:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
enable_check_generated_files: false
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ datasets/*
!datasets/karate-disjoint.csv
!datasets/netscience.csv

# nx-cugraph side effects
python/nx-cugraph/objects.inv

.pydevproject

# Jupyter Notebooks
Expand Down
13 changes: 7 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,8 @@ repos:
- id: clang-format
types_or: [c, c++, cuda]
args: ["-fallback-style=none", "-style=file", "-i"]
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.13.11
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
- repo: https://github.com/rapidsai/pre-commit-hooks
rev: v0.0.3
rev: v0.4.0
hooks:
- id: verify-copyright
files: |
Expand All @@ -57,3 +52,9 @@ repos:
[.]flake8[.]cython$|
meta[.]yaml$|
setup[.]cfg$
- id: verify-alpha-spec
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.15.1
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.10.00
24.12.00
45 changes: 1 addition & 44 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,48 +23,10 @@ echo "${version}" > VERSION
rapids-logger "Begin py build"

package_dir="python"
for package_name in pylibcugraph cugraph cugraph-pyg cugraph-dgl; do
for package_name in cugraph-pyg cugraph-dgl; do
underscore_package_name=$(echo "${package_name}" | tr "-" "_")
sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${package_name}/${underscore_package_name}/_version.py"
done
sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/nx-cugraph/_nx_cugraph/_version.py"

# TODO: Remove `--no-test` flags once importing on a CPU
# node works correctly
rapids-conda-retry mambabuild \
--no-test \
--channel "${CPP_CHANNEL}" \
conda/recipes/pylibcugraph

rapids-conda-retry mambabuild \
--no-test \
--channel "${CPP_CHANNEL}" \
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
conda/recipes/cugraph

# NOTE: nothing in nx-cugraph is CUDA-specific, but it is built on each CUDA
# platform to ensure it is included in each set of artifacts, since test
# scripts only install from one set of artifacts based on the CUDA version used
# for the test run.
rapids-conda-retry mambabuild \
--no-test \
--channel "${CPP_CHANNEL}" \
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
conda/recipes/nx-cugraph

# NOTE: nothing in the cugraph-service packages are CUDA-specific, but they are
# built on each CUDA platform to ensure they are included in each set of
# artifacts, since test scripts only install from one set of artifacts based on
# the CUDA version used for the test run.
version_file_cugraph_service_client="python/cugraph-service/client/cugraph_service_client/_version.py"
sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" ${version_file_cugraph_service_client}
version_file_cugraph_service_server="python/cugraph-service/server/cugraph_service_server/_version.py"
sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" ${version_file_cugraph_service_server}
rapids-conda-retry mambabuild \
--no-test \
--channel "${CPP_CHANNEL}" \
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
conda/recipes/cugraph-service

RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"

Expand All @@ -90,9 +52,4 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then
conda/recipes/cugraph-dgl
fi

rapids-conda-retry mambabuild \
--no-test \
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
conda/recipes/cugraph-equivariant

rapids-upload-conda-to-s3 python
16 changes: 8 additions & 8 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ dependencies:
- cuda-nvtx
- cuda-version=11.8
- cudatoolkit
- cudf==24.10.*
- cugraph==24.10.*
- cudf==24.12.*,>=0.0.0a0
- cugraph==24.12.*,>=0.0.0a0
- cupy>=12.0.0
- cython>=3.0.0
- dask-cudf==24.10.*
- dask-cudf==24.12.*,>=0.0.0a0
- dglteam/label/th21_cu118::dgl
- doxygen
- graphviz
Expand All @@ -33,18 +33,18 @@ dependencies:
- pydantic
- pydata-sphinx-theme
- pyg::pyg
- pylibcugraphops==24.10.*
- pylibraft==24.10.*
- pylibwholegraph==24.10.*
- pylibcugraphops==24.12.*,>=0.0.0a0
- pylibraft==24.12.*,>=0.0.0a0
- pylibwholegraph==24.12.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytorch-cuda=11.8
- pytorch::pytorch>=2.0,<2.2.0a0
- raft-dask==24.10.*
- raft-dask==24.12.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*
- rmm==24.12.*,>=0.0.0a0
- scikit-build-core>=0.10.0
- scipy
- setuptools>=61.0.0
Expand Down
16 changes: 8 additions & 8 deletions conda/environments/all_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ dependencies:
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-version=12.1
- cudf==24.10.*
- cugraph==24.10.*
- cudf==24.12.*,>=0.0.0a0
- cugraph==24.12.*,>=0.0.0a0
- cupy>=12.0.0
- cython>=3.0.0
- dask-cudf==24.10.*
- dask-cudf==24.12.*,>=0.0.0a0
- dglteam/label/th21_cu121::dgl
- doxygen
- graphviz
Expand All @@ -38,18 +38,18 @@ dependencies:
- pydantic
- pydata-sphinx-theme
- pyg::pyg
- pylibcugraphops==24.10.*
- pylibraft==24.10.*
- pylibwholegraph==24.10.*
- pylibcugraphops==24.12.*,>=0.0.0a0
- pylibraft==24.12.*,>=0.0.0a0
- pylibwholegraph==24.12.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytorch-cuda=12.1
- pytorch::pytorch>=2.0,<2.2.0a0
- raft-dask==24.10.*
- raft-dask==24.12.*,>=0.0.0a0
- recommonmark
- rmm==24.10.*
- rmm==24.12.*,>=0.0.0a0
- scikit-build-core>=0.10.0
- scipy
- setuptools>=61.0.0
Expand Down
63 changes: 63 additions & 0 deletions conda/environments/all_cuda-124_arch-x86_64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# This file is generated by `rapids-dependency-file-generator`.
# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
channels:
- rapidsai
- rapidsai-nightly
- dask/label/dev
- pyg
- conda-forge
- nvidia
dependencies:
- breathe
- cmake>=3.26.4,!=3.30.0
- cuda-cudart-dev
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-version=12.4
- cudf==24.12.*,>=0.0.0a0
- cugraph==24.12.*,>=0.0.0a0
- cupy>=12.0.0
- cython>=3.0.0
- dask-cudf==24.12.*,>=0.0.0a0
- dglteam/label/th21_cu121::dgl
- doxygen
- graphviz
- ipython
- libcublas-dev
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- nbsphinx
- ninja
- notebook>=0.5.0
- numba>=0.57
- numpy>=1.23,<3.0a0
- numpydoc
- pandas
- pre-commit
- pydantic
- pydata-sphinx-theme
- pyg::pyg
- pylibcugraphops==24.12.*,>=0.0.0a0
- pylibraft==24.12.*,>=0.0.0a0
- pylibwholegraph==24.12.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytorch-cuda=12.1
- pytorch::pytorch>=2.0,<2.2.0a0
- raft-dask==24.12.*,>=0.0.0a0
- recommonmark
- rmm==24.12.*,>=0.0.0a0
- scikit-build-core>=0.10.0
- scipy
- setuptools>=61.0.0
- sphinx-copybutton
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- torchdata
- wget
- wheel
name: all_cuda-124_arch-x86_64
2 changes: 1 addition & 1 deletion cpp/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "WholeGraph C API"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 24.10
PROJECT_NUMBER = 24.12

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
Loading

0 comments on commit f66383d

Please sign in to comment.