From fdeb6e4f34456112610ddb966f4c3a694b1e50be Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 30 Oct 2024 08:19:56 -0500 Subject: [PATCH 1/3] add nightly builds/tests, remove some cugraph references --- .github/workflows/build.yaml | 75 ++++++++++++++++++++++++++++++++++++ .github/workflows/test.yaml | 62 +++++++++++++++++++++++++++++ .gitignore | 20 +--------- print_env.sh | 2 +- rapids_config.cmake | 6 +-- 5 files changed, 142 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/build.yaml create mode 100644 .github/workflows/test.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..45ebaf2 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,75 @@ +name: build + +on: + push: + branches: + - "branch-*" + tags: + - v[0-9][0-9].[0-9][0-9].[0-9][0-9] + workflow_dispatch: + inputs: + branch: + required: true + type: string + date: + required: true + type: string + sha: + required: true + type: string + build_type: + type: string + default: nightly + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }} + cancel-in-progress: true + +jobs: + cpp-build: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + node_type: cpu32 + python-build: + needs: [cpp-build] + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.12 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + wheel-build-cugraph-dgl: + needs: wheel-publish-pylibwholegraph + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + script: ci/build_wheel_cugraph-dgl.sh + wheel-build-cugraph-pyg: + needs: wheel-publish-pylibwholegraph + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + script: ci/build_wheel_cugraph-pyg.sh + wheel-build-pylibwholegraph: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + script: ci/build_wheel_pylibwholegraph.sh diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 0000000..cda7a18 --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,62 @@ +name: test + +on: + workflow_dispatch: + inputs: + branch: + required: true + type: string + date: + required: true + type: string + sha: + required: true + type: string + +jobs: + conda-cpp-tests: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.12 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + conda-python-tests: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.12 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + wheel-tests-pylibwholegraph: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel_pylibwholegraph.sh + matrix_filter: map(select(.ARCH == "amd64")) + wheel-tests-cugraph-dgl: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel_cugraph-dgl.sh + matrix_filter: map(select(.ARCH == "amd64")) + wheel-tests-cugraph-pyg: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.12 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel_cugraph-pyg.sh + matrix_filter: map(select(.ARCH == "amd64")) diff --git a/.gitignore b/.gitignore index 4f4b952..93682a3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ __pycache__ DartConfiguration.tcl .DS_Store rmm_log.txt +.ruff_cache # Unit test / coverage reports htmlcov/ @@ -35,15 +36,11 @@ htmlcov dist/ *.egg-info/ python/build -python/cugraph/bindings/*.cpp wheels/ wheelhouse/ _skbuild/ cufile.log -## pylibcugraph build directories & artifacts -python/pylibcugraph/pylibcugraph.egg-info - ## Patching *.diff *.orig @@ -71,13 +68,7 @@ cpp/thirdparty/googletest/ ## Datasets datasets/ -!datasets/cyber.csv -!datasets/get_test_data.sh !datasets/karate.csv -!datasets/karate-data.csv -!datasets/karate_undirected.csv -!datasets/karate-disjoint.csv -!datasets/netscience.csv .pydevproject @@ -86,17 +77,8 @@ datasets/ ## Doxygen and Docs cpp/doxygen/html -docs/cugraph/lib* -docs/cugraph/api/* - -# created by Dask tests -python/dask-worker-space -python/cugraph/dask-worker-space -python/cugraph/cugraph/dask-worker-space -python/cugraph/cugraph/tests/dask-worker-space # Sphinx docs & build artifacts -docs/cugraph/source/api_docs/api/* _html _text diff --git a/print_env.sh b/print_env.sh index 43abd1c..1183499 100644 --- a/print_env.sh +++ b/print_env.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Copyright (c) 2019-2024, NVIDIA CORPORATION. # Reports relevant environment information useful for diagnosing and -# debugging cuGraph issues. +# debugging issues. # Usage: # "./print_env.sh" - prints to stdout # "./print_env.sh > env.txt" - prints to file "env.txt" diff --git a/rapids_config.cmake b/rapids_config.cmake index 50b1054..521a429 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -25,10 +25,10 @@ else() "Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}") endif() -if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") +if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_GNN_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") + "${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_GNN_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") endif() -include("${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") +include("${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_GNN_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") From 3ac4731d93356c7f7b0e99ad83c372cf39846d9e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 30 Oct 2024 09:05:27 -0500 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Bradley Dice --- .github/workflows/build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 45ebaf2..9d5648e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,6 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} wheel-build-cugraph-dgl: - needs: wheel-publish-pylibwholegraph secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 with: @@ -55,7 +54,6 @@ jobs: date: ${{ inputs.date }} script: ci/build_wheel_cugraph-dgl.sh wheel-build-cugraph-pyg: - needs: wheel-publish-pylibwholegraph secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.12 with: From 805062d33f7013865870992ec3956c548a847dff Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 30 Oct 2024 09:50:11 -0500 Subject: [PATCH 3/3] use default runner for wholegraph builds --- .github/workflows/build.yaml | 1 - .github/workflows/pr.yaml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9d5648e..d08e699 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,7 +34,6 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - node_type: cpu32 python-build: needs: [cpp-build] secrets: inherit diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e4451ec..3ae4d94 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -70,7 +70,6 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.12 with: build_type: pull-request - node_type: cpu32 conda-cpp-tests: needs: [conda-cpp-build, changed-files] secrets: inherit @@ -98,7 +97,6 @@ jobs: with: build_type: pull-request script: ci/build_wheel_pylibwholegraph.sh - node_type: cpu32 wheel-tests-pylibwholegraph: needs: [wheel-build-pylibwholegraph, changed-files] secrets: inherit