remove all remaining uses of cugraph-ops (#4784)

This repo should no longer need any build-time dependencies on cloning the `cugraph-ops` source code or pulling in its packages, as of these PRs: * #4744 * #4765 This PR proposes the following: * removing CI configuration related to cloning the `cugraph-ops` repo * removing CMake options related to `cugraph-ops` - `ALLOW_CLONE_CUGRAPH_OPS` - `CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL` - `CUGRAPH_USE_CUGRAPH_OPS_STATIC` - `USE_CUGRAPH_OPS` * removing dependencies on `pylibcugraphops` / `libcugraphops` in development scripts, conda recipes * removing the `cugraph-ops` docs, and references to them in other docs * removing unused source file `cpp/src/utilities/cugraph_ops_utils.hpp` * removing the `cugraph_ops` pytest marker ## Notes for Reviewers ### Benefits of these changes * faster CI * simplifies the pending work to introduce `libcugraph` wheel packages (rapidsai/rapids-wheels-planning#53) ### How I identified these changes ```shell git grep -i '_ops' git grep -i '\-ops' git grep -i 'cugraphops' ``` ### Why is this so big? I'd originally wanted to leave the docs-building stuff in place, but saw `docs-build` CI here failing because docs haven't been built from the `cugraph-ops` repo yet: https://github.com/rapidsai/cugraph/blob/c5d3d231c9cac361bf51246c13440a42eeda93b9/build.sh#L334-L341 Talked offline with @acostadon and @ChuckHastings , and we agreed that those docs could just be removed here. ### What is intentionally being left? * references in licenses (as some code from `cugraph-ops` is vendored here) * references in the docs for the GNN packages (`cugraph-dgl`, `cugraph-pyg`, `pylibwholegraph`), as those do still rely on `cugraph-ops` (their docs will eventually move out of this repo) Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Alex Barghi (https://github.com/alexbarghi-nv) - Chuck Hastings (https://github.com/ChuckHastings) URL: #4784
rapidsai · Dec 4, 2024 · 5a26158 · 5a26158
1 parent 94c6ee4
commit 5a26158
Show file tree

Hide file tree

Showing 33 changed files with 7 additions and 393 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -76,9 +76,6 @@ jobs:
       sha: ${{ inputs.sha }}
       date: ${{ inputs.date }}
       script: ci/build_wheel_pylibcugraph.sh
-      extra-repo: rapidsai/cugraph-ops
-      extra-repo-sha: branch-25.02
-      extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
       node_type: cpu32
   wheel-publish-pylibcugraph:
     needs: wheel-build-pylibcugraph
@@ -100,9 +97,6 @@ jobs:
       sha: ${{ inputs.sha }}
       date: ${{ inputs.date }}
       script: ci/build_wheel_cugraph.sh
-      extra-repo: rapidsai/cugraph-ops
-      extra-repo-sha: branch-25.02
-      extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
   wheel-publish-cugraph:
     needs: wheel-build-cugraph
     secrets: inherit

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -142,9 +142,6 @@ jobs:
     with:
       build_type: pull-request
       script: ci/build_wheel_pylibcugraph.sh
-      extra-repo: rapidsai/cugraph-ops
-      extra-repo-sha: branch-25.02
-      extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
       node_type: cpu32
   wheel-tests-pylibcugraph:
     needs: [wheel-build-pylibcugraph, changed-files]
@@ -161,9 +158,6 @@ jobs:
     with:
       build_type: pull-request
       script: ci/build_wheel_cugraph.sh
-      extra-repo: rapidsai/cugraph-ops
-      extra-repo-sha: branch-25.02
-      extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
   wheel-tests-cugraph:
     needs: [wheel-build-cugraph, changed-files]
     secrets: inherit
@@ -180,7 +174,6 @@ jobs:
       arch: '["amd64"]'
       cuda: '["12.5"]'
       node_type: cpu32
-      extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
       build_command: |
         sccache -z;
         build-all --verbose -j$(nproc --ignore=1) -DBUILD_CUGRAPH_MG_TESTS=ON;

diff --git a/README.md b/README.md
@@ -54,7 +54,6 @@
   - [libcugraph (C/C++/CUDA)](./readme_pages/libcugraph.md)
   - [nx-cugraph](https://rapids.ai/nx-cugraph/)
   - [cugraph-service](./readme_pages/cugraph_service.md)
-  - [cugraph-ops](./readme_pages/cugraph_ops.md)
 - API Docs
   - Python
     - [Python Nightly](https://docs.rapids.ai/api/cugraph/nightly/)

diff --git a/ci/build_wheel_cugraph.sh b/ci/build_wheel_cugraph.sh
@@ -30,7 +30,7 @@ case "${RAPIDS_CUDA_VERSION}" in
   ;;
 esac
 
-export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DFIND_CUGRAPH_CPP=OFF;-DCPM_cugraph-ops_SOURCE=${GITHUB_WORKSPACE}/cugraph-ops/${EXTRA_CMAKE_ARGS}"
+export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DFIND_CUGRAPH_CPP=OFF${EXTRA_CMAKE_ARGS}"
 export SKBUILD_BUILD_TOOL_ARGS="-j${PARALLEL_LEVEL};-l${PARALLEL_LEVEL}"
 
 ./ci/build_wheel.sh cugraph ${package_dir}

diff --git a/ci/build_wheel_pylibcugraph.sh b/ci/build_wheel_pylibcugraph.sh
@@ -17,7 +17,7 @@ case "${RAPIDS_CUDA_VERSION}" in
   ;;
 esac
 
-export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DFIND_CUGRAPH_CPP=OFF;-DCPM_cugraph-ops_SOURCE=${GITHUB_WORKSPACE}/cugraph-ops/${EXTRA_CMAKE_ARGS}"
+export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DFIND_CUGRAPH_CPP=OFF${EXTRA_CMAKE_ARGS}"
 export SKBUILD_BUILD_TOOL_ARGS="-j${PARALLEL_LEVEL};-l${PARALLEL_LEVEL}"
 
 ./ci/build_wheel.sh pylibcugraph ${package_dir}

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -57,12 +57,10 @@ DEPENDENCIES=(
   dask-cuda
   dask-cudf
   libcudf
-  libcugraphops
   libraft
   libraft-headers
   librmm
   pylibcugraph
-  pylibcugraphops
   pylibwholegraph
   pylibraft
   pyraft
@@ -98,8 +96,6 @@ done
 # 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

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -26,7 +26,6 @@ dependencies:
 - graphviz
 - ipython
 - libcudf==25.2.*,>=0.0.0a0
-- libcugraphops==25.2.*,>=0.0.0a0
 - libraft-headers==25.2.*,>=0.0.0a0
 - libraft==25.2.*,>=0.0.0a0
 - librmm==25.2.*,>=0.0.0a0
@@ -45,7 +44,6 @@ dependencies:
 - pre-commit
 - pydantic
 - pydata-sphinx-theme
-- pylibcugraphops==25.2.*,>=0.0.0a0
 - pylibraft==25.2.*,>=0.0.0a0
 - pylibwholegraph==25.2.*,>=0.0.0a0
 - pytest

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -29,7 +29,6 @@ dependencies:
 - ipython
 - libcublas-dev
 - libcudf==25.2.*,>=0.0.0a0
-- libcugraphops==25.2.*,>=0.0.0a0
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
@@ -50,7 +49,6 @@ dependencies:
 - pre-commit
 - pydantic
 - pydata-sphinx-theme
-- pylibcugraphops==25.2.*,>=0.0.0a0
 - pylibraft==25.2.*,>=0.0.0a0
 - pylibwholegraph==25.2.*,>=0.0.0a0
 - pytest

diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
@@ -69,7 +69,6 @@ requirements:
     - cuda-version ={{ cuda_version }}
     - doxygen {{ doxygen_version }}
     - libcudf ={{ minor_version }}
-    - libcugraphops ={{ minor_version }}
     - libraft ={{ minor_version }}
     - libraft-headers ={{ minor_version }}
     - librmm ={{ minor_version }}
@@ -114,7 +113,6 @@ outputs:
         - libcusolver
         - libcusparse
        {% endif %}
-        - libcugraphops ={{ minor_version }}
         - libraft ={{ minor_version }}
         - libraft-headers ={{ minor_version }}
         - librmm ={{ minor_version }}

diff --git a/cpp/.clang-format b/cpp/.clang-format
@@ -77,7 +77,7 @@ IncludeCategories:
     Priority:        1
   - Regex:           '^<cugraph_c/' # cuGraph C API includes
     Priority:        2
-  - Regex:           '^<(cugraph|cugraph-ops|cugraph_etl)/' # cuGraph includes
+  - Regex:           '^<(cugraph|cugraph_etl)/' # cuGraph includes
     Priority:        3
   - Regex:           '^<(cudf|raft|cuml|kvikio|cumlprims)' # Other RAPIDS includes
     Priority:        4

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -484,7 +484,6 @@ target_link_libraries(cugraph
         rmm::rmm
         raft::raft
         $<BUILD_LOCAL_INTERFACE:CUDA::toolkit>
-        $<TARGET_NAME_IF_EXISTS:cugraph-ops::cugraph-ops++>
     PRIVATE
         ${COMPILED_RAFT_LIB}
         cuco::cuco

diff --git a/cpp/src/utilities/cugraph_ops_utils.hpp b/cpp/src/utilities/cugraph_ops_utils.hpp
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -20,8 +20,6 @@ files:
       - depends_on_dask_cudf
       - depends_on_pylibraft
       - depends_on_raft_dask
-        # Deprecate pylibcugraphops
-      - depends_on_pylibcugraphops
       - depends_on_pylibwholegraph
       - depends_on_cupy
       - depends_on_pytorch
@@ -41,8 +39,6 @@ files:
       - cuda_version
       - docs
       - py_version
-        # Deprecate pylibcugraphops
-      - depends_on_pylibcugraphops
   test_cpp:
     output: none
     includes:
@@ -295,8 +291,6 @@ dependencies:
           - c-compiler
           - cxx-compiler
           - libcudf==25.2.*,>=0.0.0a0
-          # Deprecate libcugraphops
-          - libcugraphops==25.2.*,>=0.0.0a0
           - libraft-headers==25.2.*,>=0.0.0a0
           - libraft==25.2.*,>=0.0.0a0
           - librmm==25.2.*,>=0.0.0a0
@@ -710,32 +704,6 @@ dependencies:
               - pylibcugraph-cu11==25.2.*,>=0.0.0a0
           - {matrix: null, packages: [*pylibcugraph_unsuffixed]}
 
-  # deprecate pylibcugraphops
-  depends_on_pylibcugraphops:
-    common:
-      - output_types: conda
-        packages:
-          - &pylibcugraphops_unsuffixed pylibcugraphops==25.2.*,>=0.0.0a0
-      - output_types: requirements
-        packages:
-          # pip recognizes the index as a global option for the requirements.txt file
-          - --extra-index-url=https://pypi.nvidia.com
-          - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
-    specific:
-      - output_types: [requirements, pyproject]
-        matrices:
-          - matrix:
-              cuda: "12.*"
-              cuda_suffixed: "true"
-            packages:
-              - pylibcugraphops-cu12==25.2.*,>=0.0.0a0
-          - matrix:
-              cuda: "11.*"
-              cuda_suffixed: "true"
-            packages:
-              - pylibcugraphops-cu11==25.2.*,>=0.0.0a0
-          - {matrix: null, packages: [*pylibcugraphops_unsuffixed]}
-
   depends_on_cupy:
     common:
       - output_types: conda

diff --git a/docs/cugraph/source/api_docs/cugraph-ops/c_cpp/index.rst b/docs/cugraph/source/api_docs/cugraph-ops/c_cpp/index.rst
diff --git a/docs/cugraph/source/api_docs/cugraph-ops/index.rst b/docs/cugraph/source/api_docs/cugraph-ops/index.rst
diff --git a/docs/cugraph/source/api_docs/cugraph-ops/python/dimenet.rst b/docs/cugraph/source/api_docs/cugraph-ops/python/dimenet.rst
diff --git a/docs/cugraph/source/api_docs/cugraph-ops/python/graph_types.rst b/docs/cugraph/source/api_docs/cugraph-ops/python/graph_types.rst
diff --git a/docs/cugraph/source/api_docs/cugraph-ops/python/index.rst b/docs/cugraph/source/api_docs/cugraph-ops/python/index.rst