Skip to content

Fix branch build and nightly #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 7 commits into from
May 14, 2025
+29 −17
Merged

Fix branch build and nightly #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35e05b6
fix libcuopt build
rgsl888prabhu May 12, 2025
9a1b53d
Fix python 3.13 issue
rgsl888prabhu May 13, 2025
b6e99a6
fix build
rgsl888prabhu May 13, 2025
f672aed
Fix build
rgsl888prabhu May 14, 2025
6996dad
update package name
rgsl888prabhu May 14, 2025
2b3258f
change repo sha retrieval
rgsl888prabhu May 14, 2025
16f92f4
remove wheel name usage
rgsl888prabhu May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -52,9 +53,9 @@ 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-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
Expand All @@ -66,32 +67,36 @@ jobs:
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
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
#docs-build:
# if: inputs.build_type == 'nightly' || github.ref_type == 'branch'
# needs: [python-build]
Expand All @@ -116,9 +121,9 @@ 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-name: cuopt_sh_client
package-type: python
wheel-name: cuopt_sh_client
append-cuda-suffix: false
service-container:
if: inputs.build_type == 'nightly'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand All @@ -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} \
Expand Down
23 changes: 15 additions & 8 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,14 @@ 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
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
Expand All @@ -117,6 +119,7 @@ jobs:
with:
run_codecov: false
build_type: pull-request
matrix_filter: map(select(.PY_VER != "3.13"))
#docs-build:
# needs: checks
# secrets: inherit
Expand Down Expand Up @@ -144,19 +147,19 @@ 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"))))
matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13"))
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: 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])]) | add
package-name: libcuopt
package-type: cpp
wheel-name: libcuopt
build_type: pull-request
script: ci/build_wheel_libcuopt.sh
wheel-build-cuopt:
Expand All @@ -166,8 +169,9 @@ 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"))
wheel-tests-cuopt:
needs: [wheel-build-cuopt, wheel-build-cuopt-mps-parser, changed-files]
secrets: inherit
Expand All @@ -176,24 +180,26 @@ 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
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
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
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-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]
Expand All @@ -203,6 +209,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
Expand Down