Merge remote-tracking branch 'upstream/branch-24.12' into branch-24.1…

…2_remove-edge-renumber-map

.github/workflows/build.yaml

@@ -113,22 +113,3 @@ jobs:
       sha: ${{ inputs.sha }}
       date: ${{ inputs.date }}
       package-name: cugraph
-  wheel-build-cugraph-equivariant:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: ${{ inputs.build_type || 'branch' }}
-      branch: ${{ inputs.branch }}
-      sha: ${{ inputs.sha }}
-      date: ${{ inputs.date }}
-      script: ci/build_wheel_cugraph-equivariant.sh
-  wheel-publish-cugraph-equivariant:
-    needs: wheel-build-cugraph-equivariant
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: ${{ inputs.build_type || 'branch' }}
-      branch: ${{ inputs.branch }}
-      sha: ${{ inputs.sha }}
-      date: ${{ inputs.date }}
-      package-name: cugraph-equivariant

.github/workflows/pr.yaml

@@ -25,8 +25,6 @@ jobs:
       - wheel-tests-pylibcugraph
       - wheel-build-cugraph
       - wheel-tests-cugraph
-      - wheel-build-cugraph-equivariant
-      - wheel-tests-cugraph-equivariant
       - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
@@ -161,21 +159,6 @@ jobs:
     with:
       build_type: pull-request
       script: ci/test_wheel_cugraph.sh
-  wheel-build-cugraph-equivariant:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: pull-request
-      script: ci/build_wheel_cugraph-equivariant.sh
-  wheel-tests-cugraph-equivariant:
-    needs: [wheel-build-cugraph-equivariant, changed-files]
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
-    with:
-      build_type: pull-request
-      script: ci/test_wheel_cugraph-equivariant.sh
-      matrix_filter: map(select(.ARCH == "amd64"))
   devcontainer:
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]

.github/workflows/test.yaml

@@ -58,13 +58,3 @@ jobs:
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
       script: ci/test_wheel_cugraph.sh
-  wheel-tests-cugraph-equivariant:
-    secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-    with:
-      build_type: nightly
-      branch: ${{ inputs.branch }}
-      date: ${{ inputs.date }}
-      sha: ${{ inputs.sha }}
-      script: ci/test_wheel_cugraph-equivariant.sh
-      matrix_filter: map(select(.ARCH == "amd64"))

build.sh

@@ -31,7 +31,6 @@ VALIDARGS="
    cugraph-service
    cugraph-pyg
    cugraph-dgl
-   cugraph-equivariant
    cpp-mgtests
    cpp-mtmgtests
    docs
@@ -59,7 +58,6 @@ HELP="$0 [<target> ...] [<flag> ...]
    cugraph-service            - build the cugraph-service_client and cugraph-service_server Python package
    cugraph-pyg                - build the cugraph-pyg Python package
    cugraph-dgl                - build the cugraph-dgl extensions for DGL
-   cugraph-equivariant        - build the cugraph-equivariant Python package
    cpp-mgtests                - build libcugraph and libcugraph_etl MG tests. Builds MPI communicator, adding MPI as a dependency.
    cpp-mtmgtests              - build libcugraph MTMG tests. Adds UCX as a dependency (temporary).
    docs                       - build the docs
@@ -209,8 +207,7 @@ if hasArg uninstall; then
     # FIXME: if multiple versions of these packages are installed, this only
     # removes the latest one and leaves the others installed. build.sh uninstall
     # can be run multiple times to remove all of them, but that is not obvious.
-    pip uninstall -y pylibcugraph cugraph cugraph-service-client cugraph-service-server \
-        cugraph-dgl cugraph-pyg cugraph-equivariant
+    pip uninstall -y pylibcugraph cugraph cugraph-service-client cugraph-service-server
 fi
 
 if hasArg clean; then
@@ -346,15 +343,6 @@ if hasArg cugraph-dgl || hasArg all; then
     fi
 fi
 
-# Build and install the cugraph-equivariant Python package
-if hasArg cugraph-equivariant || hasArg all; then
-    if hasArg --clean; then
-        cleanPythonDir ${REPODIR}/python/cugraph-equivariant
-    else
-        python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-equivariant
-    fi
-fi
-
 # Build the docs
 if hasArg docs || hasArg all; then
     if [ ! -d ${LIBCUGRAPH_BUILD_DIR} ]; then

ci/build_python.sh

@@ -50,9 +50,4 @@ rapids-conda-retry mambabuild \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/cugraph-service
 
-rapids-conda-retry mambabuild \
-  --no-test \
-  --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
-  conda/recipes/cugraph-equivariant
-
 rapids-upload-conda-to-s3 python

ci/build_wheel.sh

@@ -29,27 +29,22 @@ python -m pip wheel \
 
 sccache --show-adv-stats
 
-# pure-python packages should be marked as pure, and not have auditwheel run on them.
-if [[ ${package_name} == "cugraph-equivariant" ]]; then
-    RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 python dist
-else
-    case "${RAPIDS_CUDA_VERSION}" in
-        12.*)
-            EXCLUDE_ARGS=(
-                --exclude "libcublas.so.12"
-                --exclude "libcublasLt.so.12"
-                --exclude "libcurand.so.10"
-                --exclude "libcusolver.so.11"
-                --exclude "libcusparse.so.12"
-                --exclude "libnvJitLink.so.12"
-            )
-        ;;
-        11.*)
-            EXCLUDE_ARGS=()
-        ;;
-    esac
-
-    mkdir -p final_dist
-    python -m auditwheel repair -w final_dist "${EXCLUDE_ARGS[@]}" dist/*
-    RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python final_dist
-fi
+case "${RAPIDS_CUDA_VERSION}" in
+    12.*)
+        EXCLUDE_ARGS=(
+            --exclude "libcublas.so.12"
+            --exclude "libcublasLt.so.12"
+            --exclude "libcurand.so.10"
+            --exclude "libcusolver.so.11"
+            --exclude "libcusparse.so.12"
+            --exclude "libnvJitLink.so.12"
+        )
+    ;;
+    11.*)
+        EXCLUDE_ARGS=()
+    ;;
+esac
+
+mkdir -p final_dist
+python -m auditwheel repair -w final_dist "${EXCLUDE_ARGS[@]}" dist/*
+RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python final_dist

ci/test_python.sh

@@ -100,42 +100,5 @@ rapids-logger "pytest cugraph-service (single GPU)"
   --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-service-coverage.xml" \
   --cov-report=term
 
-# test cugraph-equivariant
-if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
-  if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
-    rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_equivariant
-    set +u
-    conda activate test_cugraph_equivariant
-    set -u
-    rapids-mamba-retry install \
-      --channel "${CPP_CHANNEL}" \
-      --channel "${PYTHON_CHANNEL}" \
-      --channel conda-forge \
-      --channel nvidia \
-      "cugraph-equivariant=${RAPIDS_VERSION_MAJOR_MINOR}.*"
-    pip install e3nn==0.5.1
-
-    rapids-print-env
-
-    rapids-logger "pytest cugraph-equivariant"
-    ./ci/run_cugraph_equivariant_pytests.sh \
-      --junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph-equivariant.xml" \
-      --cov-config=../../.coveragerc \
-      --cov=cugraph_equivariant \
-      --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-equivariant-coverage.xml" \
-      --cov-report=term
-
-    # Reactivate the test environment back
-    set +u
-    conda deactivate
-    conda activate test
-    set -u
-  else
-    rapids-logger "skipping cugraph-equivariant pytest on ARM64"
-  fi
-else
-  rapids-logger "skipping cugraph-equivariant pytest on CUDA!=11.8"
-fi
-
 rapids-logger "Test script exiting with value: $EXITCODE"
 exit ${EXITCODE}

cpp/tests/community/balanced_edge_test.cpp

@@ -15,7 +15,7 @@
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
 
-TEST(balanced_edge, success)
+TEST(balanced_edge, DISABLED_success)
 {
   std::vector<int> off_h = {0,  16,  25,  35,  41,  44,  48,  52,  56,  61,  63, 66,
                             67, 69,  74,  76,  78,  80,  82,  84,  87,  89,  91, 93,

dependencies.yaml

@@ -202,30 +202,6 @@ files:
       - test_python_common
       - depends_on_pylibwholegraph
       - depends_on_pytorch
-  py_build_cugraph_equivariant:
-    output: pyproject
-    pyproject_dir: python/cugraph-equivariant
-    extras:
-      table: build-system
-    includes:
-      - python_build_rapids
-      - python_build_wheel
-  py_run_cugraph_equivariant:
-    output: pyproject
-    pyproject_dir: python/cugraph-equivariant
-    extras:
-      table: project
-    includes:
-        # Deprecate pylibcugraphops
-      - depends_on_pylibcugraphops
-  py_test_cugraph_equivariant:
-    output: pyproject
-    pyproject_dir: python/cugraph-equivariant
-    extras:
-      table: project.optional-dependencies
-      key: test
-    includes:
-      - test_python_common
   py_build_cugraph_service_client:
     output: pyproject
     pyproject_dir: python/cugraph-service/client

docs/cugraph/source/installation/getting_cugraph.md

@@ -31,7 +31,6 @@ cuGraph Conda packages
  * cugraph-service-server
  * cugraph-dgl
  * cugraph-pyg
- * cugraph-equivariant
  * nx-cugraph
 
 Replace the package name in the example below to the one you want to install.
@@ -61,7 +60,6 @@ Replace `-cu12` with `-cu11` for packages supporting CUDA 11.
 Also available:
  * cugraph-dgl-cu12
  * cugraph-pyg-cu12
- * cugraph-equivariant-cu12
  * nx-cugraph-cu12
 
 <br>

docs/cugraph/source/nx_cugraph/benchmarks.md

@@ -9,7 +9,7 @@ We ran several commonly used graph algorithms on both `networkx` and `nx-cugraph
 ![bench-image](../_static/bc_benchmark.png)
 
 <figcaption style="text-align: center;">Results from running this <a
-href="https://github.com/rapidsai/cugraph/blob/HEAD/benchmarks/nx-cugraph/pytest-based/bench_algos.py">Benchmark</a><span
+href="https://github.com/rapidsai/nx-cugraph/blob/HEAD/benchmarks/nx-cugraph/pytest-based/bench_algos.py">Benchmark</a><span
 class="title-ref"></span></figcaption>
 </figure>
 
@@ -23,4 +23,4 @@ Below are the steps to reproduce the results on your own.
 
 4. Install the latest `nx-cugraph` by following the [Installation Guide](installation.md)
 
-5. Follow the instructions written in the README [here](https://github.com/rapidsai/cugraph/blob/HEAD/benchmarks/nx-cugraph/pytest-based)
+5. Follow the instructions written in the README [here](https://github.com/rapidsai/nx-cugraph/blob/HEAD/benchmarks/nx-cugraph/pytest-based/README.md)

docs/cugraph/source/nx_cugraph/supported-algorithms.rst

@@ -352,4 +352,4 @@ Generators
 
 
 To request nx-cugraph backend support for a NetworkX API that is not listed
-above, visit the `cuGraph GitHub repo <https://github.com/rapidsai/cugraph>`_.
+above, visit the `nx-cugraph GitHub repo <https://github.com/rapidsai/nx-cugraph>`_.