diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2b5c5c2..5138f27 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -29,7 +29,7 @@ jobs: docs-build: if: github.ref_type == 'branch' secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 with: branch: ${{ inputs.branch }} build_type: ${{ inputs.build_type || 'branch' }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2db0801..96a1065 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -10,11 +10,44 @@ concurrency: cancel-in-progress: true jobs: + pr-builder: + needs: + - telemetry-setup + - docs-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02 + if: always() + with: + needs: ${{ toJSON(needs) }} + telemetry-setup: + runs-on: ubuntu-latest + continue-on-error: true + env: + OTEL_SERVICE_NAME: "pr-cugraph-docs" + steps: + - name: Telemetry setup + uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main docs-build: + needs: telemetry-setup secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 with: build_type: pull-request - node_type: "cpu4" + node_type: "gpu-v100-latest-1" + arch: "amd64" container_image: "rapidsai/ci-conda:latest" run_script: "ci/build_docs.sh" + telemetry-summarize: + runs-on: ubuntu-latest + needs: pr-builder + if: always() + continue-on-error: true + steps: + - name: Load stashed telemetry env vars + uses: rapidsai/shared-actions/telemetry-dispatch-load-base-env-vars@main + with: + load_service_name: true + - name: Telemetry summarize + uses: rapidsai/shared-actions/telemetry-dispatch-write-summary@main + with: + cert_concat: "${{ secrets.OTEL_EXPORTER_OTLP_CA_CERTIFICATE }};${{ secrets.OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE }};${{ secrets.OTEL_EXPORTER_OTLP_CLIENT_KEY }}" diff --git a/VERSION b/VERSION index 7c7ba04..72eefaf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.10.00 +25.02.00 diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 2d11a56..fde6677 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -73,40 +73,15 @@ DEPENDENCIES=( rapids-dask-dependency ) for DEP in "${DEPENDENCIES[@]}"; do - for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do + for FILE in dependencies.yaml conda/environments/*.yaml; do sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}" sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*/g" "${FILE}" done - for FILE in python/**/pyproject.toml python/**/**/pyproject.toml; do - sed_runner "/\"${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*\"/g" "${FILE}" - sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*\"/g" "${FILE}" - done done -# ucx-py version -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph/conda_build_config.yaml -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph-service/conda_build_config.yaml -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/pylibcugraph/conda_build_config.yaml - # CI files for FILE in .github/workflows/*.yaml; do sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" - # Wheel builds clone cugraph-ops, update its branch - sed_runner "s/extra-repo-sha: branch-.*/extra-repo-sha: branch-${NEXT_SHORT_TAG}/g" "${FILE}" - # Wheel builds install dask-cuda from source, update its branch - sed_runner "s/dask-cuda.git@branch-[0-9][0-9].[0-9][0-9]/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" "${FILE}" -done - -sed_runner "s/branch-.*/branch-${NEXT_SHORT_TAG}/g" python/nx-cugraph/README.md - -# .devcontainer files -find .devcontainer/ -type f -name devcontainer.json -print0 | while IFS= read -r -d '' filename; do - sed_runner "s@rapidsai/devcontainers:[0-9.]*@rapidsai/devcontainers:${NEXT_SHORT_TAG}@g" "${filename}" - sed_runner "s@rapidsai/devcontainers/features/ucx:[0-9.]*@rapidsai/devcontainers/features/ucx:${NEXT_SHORT_TAG_PEP440}@" "${filename}" - sed_runner "s@rapidsai/devcontainers/features/cuda:[0-9.]*@rapidsai/devcontainers/features/cuda:${NEXT_SHORT_TAG_PEP440}@" "${filename}" - sed_runner "s@rapidsai/devcontainers/features/rapids-build-utils:[0-9.]*@rapidsai/devcontainers/features/rapids-build-utils:${NEXT_SHORT_TAG_PEP440}@" "${filename}" - sed_runner "s@rapids-\${localWorkspaceFolderBasename}-[0-9.]*@rapids-\${localWorkspaceFolderBasename}-${NEXT_SHORT_TAG}@g" "${filename}" done -sed_runner "s/:[0-9][0-9]\.[0-9][0-9]/:${NEXT_SHORT_TAG}/" ./notebooks/README.md -sed_runner "s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/" ./docs/cugraph/source/nx_cugraph/nx_cugraph.md +sed_runner "s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/" ./docs/cugraph-docs/source/nx_cugraph/nx_cugraph.md diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index e3bab60..3417abd 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -10,8 +10,8 @@ channels: dependencies: - breathe - cuda-version=11.8 -- cugraph-dgl==24.8.* -- cugraph==24.8.* +- cugraph-dgl==25.2.* +- cugraph==25.2.* - dglteam/label/th23_cu118::dgl - doxygen - graphviz @@ -20,8 +20,8 @@ dependencies: - numpydoc - pre-commit - pydata-sphinx-theme -- pylibcugraphops==24.8.* -- pylibwholegraph==24.8.* +- pylibcugraphops==25.2.* +- pylibwholegraph==25.2.* - recommonmark - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index cf951cb..ad58639 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -10,8 +10,8 @@ channels: dependencies: - breathe - cuda-version=12.2 -- cugraph-dgl==24.8.* -- cugraph==24.8.* +- cugraph-dgl==25.2.* +- cugraph==25.2.* - dglteam/label/th23_cu121::dgl - doxygen - graphviz @@ -20,8 +20,8 @@ dependencies: - numpydoc - pre-commit - pydata-sphinx-theme -- pylibcugraphops==24.8.* -- pylibwholegraph==24.8.* +- pylibcugraphops==25.2.* +- pylibwholegraph==25.2.* - recommonmark - sphinx-copybutton - sphinx-markdown-tables diff --git a/dependencies.yaml b/dependencies.yaml index 87c1fe0..d7ca499 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -97,7 +97,7 @@ dependencies: common: - output_types: conda packages: - - &pylibwholegraph_conda pylibwholegraph==24.8.* + - &pylibwholegraph_conda pylibwholegraph==25.2.* - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -108,17 +108,17 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - pylibwholegraph-cu12==24.8.* + - pylibwholegraph-cu12==25.2.* - matrix: {cuda: "11.*"} packages: - - pylibwholegraph-cu11==24.8.* + - pylibwholegraph-cu11==25.2.* - {matrix: null, packages: [*pylibwholegraph_conda]} depends_on_cugraph: common: - output_types: conda packages: - - &cugraph_conda cugraph==24.8.* + - &cugraph_conda cugraph==25.2.* - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -129,17 +129,17 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - cugraph-cu12==24.8.* + - cugraph-cu12==25.2.* - matrix: {cuda: "11.*"} packages: - - cugraph-cu11==24.8.* + - cugraph-cu11==25.2.* - {matrix: null, packages: [*cugraph_conda]} depends_on_cugraph_dgl: common: - output_types: conda packages: - - &cugraph_dgl_conda cugraph-dgl==24.8.* + - &cugraph_dgl_conda cugraph-dgl==25.2.* - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -150,10 +150,10 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - cugraph-dgl-cu12==24.8.* + - cugraph-dgl-cu12==25.2.* - matrix: {cuda: "11.*"} packages: - - cugraph-dgl-cu11==24.8.* + - cugraph-dgl-cu11==25.2.* - {matrix: null, packages: [*cugraph_dgl_conda]} depends_on_dgl: @@ -174,7 +174,7 @@ dependencies: common: - output_types: conda packages: - - &pylibcugraph_conda pylibcugraph==24.8.* + - &pylibcugraph_conda pylibcugraph==25.2.* - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -185,17 +185,17 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - pylibcugraph-cu12==24.8.* + - pylibcugraph-cu12==25.2.* - matrix: {cuda: "11.*"} packages: - - pylibcugraph-cu11==24.8.* + - pylibcugraph-cu11==25.2.* - {matrix: null, packages: [*pylibcugraph_conda]} depends_on_pylibcugraphops: common: - output_types: conda packages: - - &pylibcugraphops_conda pylibcugraphops==24.8.* + - &pylibcugraphops_conda pylibcugraphops==25.2.* - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -206,8 +206,8 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - pylibcugraphops-cu12==24.8.* + - pylibcugraphops-cu12==25.2.* - matrix: {cuda: "11.*"} packages: - - pylibcugraphops-cu11==24.8.* + - pylibcugraphops-cu11==25.2.* - {matrix: null, packages: [*pylibcugraphops_conda]} diff --git a/docs/cugraph-docs/source/nx_cugraph/nx_cugraph.md b/docs/cugraph-docs/source/nx_cugraph/nx_cugraph.md index 82bebec..ab0d057 100644 --- a/docs/cugraph-docs/source/nx_cugraph/nx_cugraph.md +++ b/docs/cugraph-docs/source/nx_cugraph/nx_cugraph.md @@ -4,7 +4,7 @@ Whereas previous versions of cuGraph have included mechanisms to make it trivial to plug in cuGraph algorithm calls. Beginning with version 24.02, nx-cuGraph is now a [networkX backend](). -The user now need only [install nx-cugraph]() +The user now need only [install nx-cugraph]() to experience GPU speedups. Lets look at some examples of algorithm speedups comparing CPU based NetworkX to dispatched versions run on GPU with nx_cugraph.