From 35e05b65b0c1f578ea489bc9350799c32d749696 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Mon, 12 May 2025 18:22:48 -0500 Subject: [PATCH 1/7] fix libcuopt build --- .github/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7cfeb641d7..004aa42453 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -61,6 +61,8 @@ jobs: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: + # build for every combination of arch and CUDA version, but only for the latest Python + matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber))) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} From 9a1b53d892114439340d4206de3b89f647c7ed5a Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Tue, 13 May 2025 10:54:05 -0500 Subject: [PATCH 2/7] Fix python 3.13 issue --- .github/workflows/build.yaml | 7 +++++-- .github/workflows/pr.yaml | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 004aa42453..ceb37b9b06 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -43,6 +43,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + matrix_filter: map(select(.PY_VER != "3.13")) wheel-build-cuopt-mps-parser: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 @@ -52,7 +53,7 @@ jobs: sha: ${{ inputs.sha }} date: ${{ inputs.date }} script: ci/build_wheel_cuopt_mps_parser.sh - matrix_filter: map(select((.CUDA_VER | startswith("12")))) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) package-type: python wheel-name: cuopt_mps_parser append-cuda-suffix: false @@ -82,6 +83,7 @@ jobs: script: ci/build_wheel_cuopt.sh package-type: python wheel-name: cuopt + matrix_filter: map(select(.PY_VER != "3.13")) wheel-build-cuopt-server: needs: wheel-build-cuopt secrets: inherit @@ -94,6 +96,7 @@ jobs: script: ci/build_wheel_cuopt_server.sh package-type: python wheel-name: cuopt_server + matrix_filter: map(select(.PY_VER != "3.13")) #docs-build: # if: inputs.build_type == 'nightly' || github.ref_type == 'branch' # needs: [python-build] @@ -118,7 +121,7 @@ jobs: sha: ${{ inputs.sha }} date: ${{ inputs.date }} script: ci/build_wheel_cuopt_sh_client.sh - matrix_filter: map(select((.CUDA_VER | startswith("12")))) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) package-type: python wheel-name: cuopt_sh_client append-cuda-suffix: false diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 8bc9674d19..4d0d754d52 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -109,6 +109,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06 with: build_type: pull-request + matrix_filter: map(select(.PY_VER != "3.13")) conda-python-tests: needs: [conda-python-build, changed-files] secrets: inherit @@ -117,6 +118,7 @@ jobs: with: run_codecov: false build_type: pull-request + matrix_filter: map(select(.PY_VER != "3.13")) #docs-build: # needs: checks # secrets: inherit @@ -147,7 +149,7 @@ jobs: package-type: python wheel-name: cuopt_mps_parser append-cuda-suffix: false - matrix_filter: map(select((.CUDA_VER | startswith("12")))) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) wheel-build-libcuopt: needs: wheel-build-cuopt-mps-parser secrets: inherit @@ -168,6 +170,7 @@ jobs: script: ci/build_wheel_cuopt.sh package-type: python wheel-name: cuopt + matrix_filter: map(select(.PY_VER != "3.13")) wheel-tests-cuopt: needs: [wheel-build-cuopt, wheel-build-cuopt-mps-parser, changed-files] secrets: inherit @@ -185,13 +188,14 @@ jobs: script: ci/build_wheel_cuopt_server.sh package-type: python wheel-name: cuopt_server + matrix_filter: map(select(.PY_VER != "3.13")) wheel-build-cuopt-sh-client: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: build_type: pull-request script: ci/build_wheel_cuopt_sh_client.sh - matrix_filter: map(select((.CUDA_VER | startswith("12")))) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) package-type: python wheel-name: cuopt_sh_client append-cuda-suffix: false @@ -203,6 +207,7 @@ jobs: with: build_type: pull-request script: ci/test_wheel_cuopt_server.sh + matrix_filter: map(select(.PY_VER != "3.13")) test-self-hosted-server: needs: [wheel-build-cuopt-server, changed-files] secrets: inherit From b6e99a6ef71c66d99d740073a54e8118fb27f191 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Tue, 13 May 2025 11:29:32 -0500 Subject: [PATCH 3/7] fix build --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ceb37b9b06..6c53fdee6a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -63,7 +63,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: # build for every combination of arch and CUDA version, but only for the latest Python - matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber))) + matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 4d0d754d52..86f8cf6050 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -103,6 +103,7 @@ jobs: #if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp with: build_type: pull-request + matrix_filter: map(select(.PY_VER != "3.13")) conda-python-build: needs: conda-cpp-build secrets: inherit @@ -156,7 +157,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: # build for every combination of arch and CUDA version, but only for the latest Python - matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber))) + matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) package-type: cpp wheel-name: libcuopt build_type: pull-request From f672aed186fe8bc73c0ce52d82363025574b2365 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Wed, 14 May 2025 10:04:39 -0500 Subject: [PATCH 4/7] Fix build --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6c53fdee6a..6b40f62564 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -63,7 +63,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: # build for every combination of arch and CUDA version, but only for the latest Python - matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) + matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | add build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 86f8cf6050..05967c9be9 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -157,7 +157,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: # build for every combination of arch and CUDA version, but only for the latest Python - matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) + matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | add package-type: cpp wheel-name: libcuopt build_type: pull-request From 6996dad07f50e1d5b98aa8ba9354370501fb264d Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Wed, 14 May 2025 10:31:56 -0500 Subject: [PATCH 5/7] update package name --- .github/workflows/build.yaml | 18 +++++++++--------- .github/workflows/pr.yaml | 10 ++++++---- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6b40f62564..978bbafd5c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -54,49 +54,49 @@ jobs: date: ${{ inputs.date }} script: ci/build_wheel_cuopt_mps_parser.sh matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + package-name: cuopt_mps_parser package-type: python - wheel-name: cuopt_mps_parser append-cuda-suffix: false wheel-build-libcuopt: needs: wheel-build-cuopt-mps-parser secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: - # build for every combination of arch and CUDA version, but only for the latest Python - matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | add build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} date: ${{ inputs.date }} script: ci/build_wheel_libcuopt.sh + package-name: libcuopt package-type: cpp - wheel-name: libcuopt + # build for every combination of arch and CUDA version, but only for the latest Python + matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | add wheel-build-cuopt: needs: [wheel-build-cuopt-mps-parser, wheel-build-libcuopt] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: + matrix_filter: map(select(.PY_VER != "3.13")) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} date: ${{ inputs.date }} script: ci/build_wheel_cuopt.sh + package-name: cuopt package-type: python - wheel-name: cuopt - matrix_filter: map(select(.PY_VER != "3.13")) wheel-build-cuopt-server: needs: wheel-build-cuopt secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: + matrix_filter: map(select(.PY_VER != "3.13")) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} date: ${{ inputs.date }} script: ci/build_wheel_cuopt_server.sh + package-name: cuopt_server package-type: python - wheel-name: cuopt_server - matrix_filter: map(select(.PY_VER != "3.13")) #docs-build: # if: inputs.build_type == 'nightly' || github.ref_type == 'branch' # needs: [python-build] @@ -122,8 +122,8 @@ jobs: date: ${{ inputs.date }} script: ci/build_wheel_cuopt_sh_client.sh matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + package-name: cuopt_sh_client package-type: python - wheel-name: cuopt_sh_client append-cuda-suffix: false service-container: if: inputs.build_type == 'nightly' diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 05967c9be9..05a8bb2132 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -147,8 +147,8 @@ jobs: with: build_type: pull-request script: ci/build_wheel_cuopt_mps_parser.sh + package-name: cuopt_mps_parser package-type: python - wheel-name: cuopt_mps_parser append-cuda-suffix: false matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) wheel-build-libcuopt: @@ -158,8 +158,8 @@ jobs: with: # build for every combination of arch and CUDA version, but only for the latest Python matrix_filter: map(select(.PY_VER == "3.12")) | group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | add + package-name: libcuopt package-type: cpp - wheel-name: libcuopt build_type: pull-request script: ci/build_wheel_libcuopt.sh wheel-build-cuopt: @@ -169,6 +169,7 @@ jobs: with: build_type: pull-request script: ci/build_wheel_cuopt.sh + package-name: cuopt package-type: python wheel-name: cuopt matrix_filter: map(select(.PY_VER != "3.13")) @@ -180,6 +181,7 @@ jobs: with: build_type: pull-request script: ci/test_wheel_cuopt.sh + matrix_filter: map(select(.PY_VER != "3.13")) wheel-build-cuopt-server: needs: wheel-build-cuopt secrets: inherit @@ -187,8 +189,8 @@ jobs: with: build_type: pull-request script: ci/build_wheel_cuopt_server.sh + package-name: cuopt_server package-type: python - wheel-name: cuopt_server matrix_filter: map(select(.PY_VER != "3.13")) wheel-build-cuopt-sh-client: secrets: inherit @@ -197,8 +199,8 @@ jobs: build_type: pull-request script: ci/build_wheel_cuopt_sh_client.sh matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + package-name: cuopt_sh_client package-type: python - wheel-name: cuopt_sh_client append-cuda-suffix: false wheel-tests-cuopt-server: needs: [wheel-build-cuopt-server, changed-files] From 2b3258f72a9ae954960e8b77e30f929c5aff9ca9 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Wed, 14 May 2025 11:19:43 -0500 Subject: [PATCH 6/7] change repo sha retrieval --- .github/workflows/nightly.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index ba1564a9cb..8d4760f502 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -21,7 +21,7 @@ jobs: run: | export CUOPT_BRANCH="branch-${{ matrix.cuopt_version }}" export DATE=$(date +%F) - export SHA=$(gh api -q '.commit.sha' "repos/rapidsai/cuopt/branches/${CUOPT_BRANCH}") + export SHA=$(gh api -q '.commit.sha' "repos/nvidia/cuopt/branches/${CUOPT_BRANCH}") gh workflow run build.yaml \ -f branch=${CUOPT_BRANCH} \ @@ -44,7 +44,7 @@ jobs: run: | export CUOPT_BRANCH="branch-${{ matrix.cuopt_version }}" export DATE=$(date +%F) - export SHA=$(gh api -q '.commit.sha' "repos/rapidsai/cuopt/branches/${CUOPT_BRANCH}") + export SHA=$(gh api -q '.commit.sha' "repos/nvidia/cuopt/branches/${CUOPT_BRANCH}") gh workflow run test.yaml \ -f branch=${CUOPT_BRANCH} \ From 16f92f4d643f4e212a84496399511fa83e74493f Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Wed, 14 May 2025 11:23:21 -0500 Subject: [PATCH 7/7] remove wheel name usage --- .github/workflows/pr.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 05a8bb2132..8aae3f8d25 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -171,7 +171,6 @@ jobs: script: ci/build_wheel_cuopt.sh package-name: cuopt package-type: python - wheel-name: cuopt matrix_filter: map(select(.PY_VER != "3.13")) wheel-tests-cuopt: needs: [wheel-build-cuopt, wheel-build-cuopt-mps-parser, changed-files]