From 4384142b13b82caf7fab034593171280921ec8e6 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Thu, 22 May 2025 16:42:23 -0500 Subject: [PATCH 1/6] remove cuda11 support --- .github/workflows/build.yaml | 10 +-- .github/workflows/pr.yaml | 18 ++-- README.md | 15 +--- ci/release/update-version-cuopt.sh | 2 +- ci/release/update-version-rapids.sh | 2 +- dependencies.yaml | 127 +--------------------------- 6 files changed, 20 insertions(+), 154 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 978bbafd5c..8e86f590cd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,6 +30,7 @@ jobs: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06 with: + matrix_filter: map(select((.CUDA_VER | startswith("12")))) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} date: ${{ inputs.date }} @@ -39,11 +40,11 @@ jobs: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06 with: + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) build_type: ${{ inputs.build_type || 'branch' }} 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 @@ -69,14 +70,13 @@ jobs: script: ci/build_wheel_libcuopt.sh package-name: libcuopt package-type: cpp - # 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 + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) 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")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} @@ -89,7 +89,7 @@ jobs: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: - matrix_filter: map(select(.PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) 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 8aae3f8d25..1dba87ed22 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -96,6 +96,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06 with: build_type: pull-request + matrix_filter: map(select((.CUDA_VER | startswith("12")))) conda-cpp-tests: needs: [conda-cpp-build, changed-files] secrets: inherit @@ -103,14 +104,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")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .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")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) conda-python-tests: needs: [conda-python-build, changed-files] secrets: inherit @@ -119,7 +120,7 @@ jobs: with: run_codecov: false build_type: pull-request - matrix_filter: map(select(.PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) #docs-build: # needs: checks # secrets: inherit @@ -157,8 +158,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])]) | add - package-name: libcuopt + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) package-type: cpp build_type: pull-request script: ci/build_wheel_libcuopt.sh @@ -171,7 +171,7 @@ jobs: script: ci/build_wheel_cuopt.sh package-name: cuopt package-type: python - matrix_filter: map(select(.PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) wheel-tests-cuopt: needs: [wheel-build-cuopt, wheel-build-cuopt-mps-parser, changed-files] secrets: inherit @@ -180,7 +180,7 @@ jobs: with: build_type: pull-request script: ci/test_wheel_cuopt.sh - matrix_filter: map(select(.PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) wheel-build-cuopt-server: needs: wheel-build-cuopt secrets: inherit @@ -190,7 +190,7 @@ jobs: script: ci/build_wheel_cuopt_server.sh package-name: cuopt_server package-type: python - matrix_filter: map(select(.PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) wheel-build-cuopt-sh-client: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 @@ -209,7 +209,7 @@ jobs: with: build_type: pull-request script: ci/test_wheel_cuopt_server.sh - matrix_filter: map(select(.PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) test-self-hosted-server: needs: [wheel-build-cuopt-server, changed-files] secrets: inherit diff --git a/README.md b/README.md index 122c10afc5..04cee39118 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Review the [CONTRIBUTING.md](CONTRIBUTING.md) file for information on how to con ### CUDA/GPU requirements -* CUDA 11.2+ -* NVIDIA driver 450.80.02+ +* CUDA 12.0+ +* NVIDIA driver >= 525.60.13 (Linux) and >= 527.41 (Windows) * Volta architecture or better (Compute Capability >=7.0) ### Pip @@ -32,12 +32,6 @@ cuOpt can be installed via `pip` from the NVIDIA Python Package Index. Be sure to select the appropriate cuOpt package depending on the major version of CUDA available in your environment: -For CUDA 11.x: - -```bash -pip install --extra-index-url=https://pypi.nvidia.com cuopt-cu11 -``` - For CUDA 12.x: ```bash @@ -48,11 +42,6 @@ pip install --extra-index-url=https://pypi.nvidia.com cuopt-cu12 cuOpt can be installed with conda (via [miniforge](https://github.com/conda-forge/miniforge)) from the `nvidia` channel: -For CUDA 11.x: -```bash -conda install -c rapidsai -c conda-forge -c nvidia \ - cuopt=25.05 python=3.12 cuda-version=11.8 -``` For CUDA 12.x: ```bash diff --git a/ci/release/update-version-cuopt.sh b/ci/release/update-version-cuopt.sh index c29f990a04..97f9f8b3bb 100755 --- a/ci/release/update-version-cuopt.sh +++ b/ci/release/update-version-cuopt.sh @@ -37,7 +37,7 @@ function sed_runner() { # Centralized version file update echo "${NEXT_FULL_TAG}" > VERSION -dependencies='cuopt-cu11 cuopt-cu12 cuopt-mps-parser' +dependencies='cuopt-cu12 cuopt-mps-parser' for FILE in conda/environments/*.yaml dependencies.yaml; do for dependency in ${dependencies}; do sed_runner "s/- ${dependency}==.*/- ${dependency}==${NEXT_SHORT_TAG}\.*/g" "${FILE}"; diff --git a/ci/release/update-version-rapids.sh b/ci/release/update-version-rapids.sh index 67eca55e5d..1969187c8c 100755 --- a/ci/release/update-version-rapids.sh +++ b/ci/release/update-version-rapids.sh @@ -43,7 +43,7 @@ sed_runner 's/'"DEPENDENT_LIB_MAJOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MAJ sed_runner 's/'"DEPENDENT_LIB_MINOR_VERSION \"[0-9][0-9]\""'/'"DEPENDENT_LIB_MINOR_VERSION \"${NEXT_MINOR}\""'/g' cpp/CMakeLists.txt # RTD update -dependencies='cudf cudf-cu11 cudf-cu12 cuvs cuvs-cu11 cuvs-cu12 libcudf rmm rmm-cu11 rmm-cu12 librmm libraft-headers pylibraft pylibraft-cu11 pylibraft-cu12 raft-dask raft-dask-cu11 raft-dask-cu12 rapids-dask-dependency' +dependencies='cudf cudf-cu12 cuvs cuvs-cu12 libcudf rmm rmm-cu12 librmm libraft-headers pylibraft pylibraft-cu12 raft-dask rapids-dask-dependency' for FILE in conda/environments/*.yaml dependencies.yaml; do for dependency in ${dependencies}; do sed_runner "s/- ${dependency}==.*/- ${dependency}==${NEXT_SHORT_TAG_PEP440}\.*/g" "${FILE}"; diff --git a/dependencies.yaml b/dependencies.yaml index 0439b4c467..97b23a70fb 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -19,7 +19,7 @@ files: all: output: conda matrix: - cuda: ["11.8", "12.8"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - build_common @@ -284,18 +284,6 @@ dependencies: specific: - output_types: conda matrices: - - matrix: - arch: x86_64 - cuda: "11.8" - packages: - - gcc_linux-64=11.* - - sysroot_linux-64==2.28 - - matrix: - arch: aarch64 - cuda: "11.8" - packages: - - gcc_linux-aarch64=11.* - - sysroot_linux-aarch64==2.28 - matrix: arch: x86_64 cuda: "12.*" @@ -314,16 +302,6 @@ dependencies: cuda: "12.*" packages: - cuda-nvcc - - matrix: - arch: x86_64 - cuda: "11.8" - packages: - - nvcc_linux-64=11.8 - - matrix: - arch: aarch64 - cuda: "11.8" - packages: - - nvcc_linux-aarch64=11.8 build_cpp: common: - output_types: conda @@ -344,14 +322,6 @@ dependencies: cuda: "12.*" packages: - cuda-sanitizer-api - - matrix: - cuda: "11.8" - packages: - - cuda-sanitizer-api=11.8.86 - - matrix: - cuda: "11.5" - packages: - - cuda-sanitizer-api=11.5.114 - matrix: packages: build_wheels: @@ -405,14 +375,9 @@ dependencies: cuda_suffixed: "true" packages: - cupy-cuda12x - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - cupy-cuda11x>=12.0.0 - matrix: null packages: - - cupy-cuda11x>=12.0.0 + - cupy-cuda12x test_python_cuopt_server: common: @@ -480,11 +445,6 @@ dependencies: cuda_suffixed: "true" packages: - libcuopt-cu12==25.5.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - libcuopt-cu11==25.5.*,>=0.0.0a0 - {matrix: null, packages: [*libcuopt_unsuffixed]} depends_on_cuopt: common: @@ -504,11 +464,6 @@ dependencies: cuda_suffixed: "true" packages: - cuopt-cu12==25.5.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - cuopt-cu11==25.5.*,>=0.0.0a0 - {matrix: null, packages: [*cuopt_unsuffixed]} depends_on_mps_parser: common: @@ -543,11 +498,6 @@ dependencies: cuda_suffixed: "true" packages: - librmm-cu12==25.4.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - librmm-cu11==25.4.*,>=0.0.0a0 - {matrix: null, packages: [*librmm_unsuffixed]} depends_on_cupy: common: @@ -583,11 +533,6 @@ dependencies: cuda_suffixed: "true" packages: - rmm-cu12==25.4.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - rmm-cu11==25.4.*,>=0.0.0a0 - matrix: packages: - *rmm_unsuffixed @@ -609,11 +554,6 @@ dependencies: cuda_suffixed: "true" packages: - cudf-cu12==25.4.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - cudf-cu11==25.4.*,>=0.0.0a0 - matrix: packages: - *cudf_unsuffixed @@ -635,11 +575,6 @@ dependencies: cuda_suffixed: "true" packages: - cuvs-cu12==25.4.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - cuvs-cu11==25.4.*,>=0.0.0a0 - matrix: packages: - *cuvs_unsuffixed @@ -661,11 +596,6 @@ dependencies: cuda_suffixed: "true" packages: - raft-dask-cu12==25.4.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - raft-dask-cu11==25.4.*,>=0.0.0a0 - matrix: packages: - *raft_dask_unsuffixed @@ -687,11 +617,6 @@ dependencies: cuda_suffixed: "true" packages: - pylibraft-cu12==25.4.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - pylibraft-cu11==25.4.*,>=0.0.0a0 - matrix: packages: - *pylibraft_unsuffixed @@ -699,22 +624,6 @@ dependencies: specific: - output_types: conda matrices: - - matrix: - cuda: "11.2" - packages: - - cuda-version=11.2 - - matrix: - cuda: "11.4" - packages: - - cuda-version=11.4 - - matrix: - cuda: "11.5" - packages: - - cuda-version=11.5 - - matrix: - cuda: "11.8" - packages: - - cuda-version=11.8 - matrix: cuda: "12.0" packages: @@ -756,29 +665,6 @@ dependencies: - cuda-nvvm - cuda-crt - pynvjitlink=0.5.0 - - matrix: - cuda: "11.8" - packages: - - cudatoolkit - - cuda-nvtx=11.8 - - matrix: - cuda: "11.5" - packages: - - cudatoolkit - - cuda-nvtx=11.5 - - matrix: - cuda: "11.4" - packages: - - cudatoolkit - - &cudanvtx114 cuda-nvtx=11.4 - - matrix: - cuda: "11.2" - packages: - - cudatoolkit - # The NVIDIA channel doesn't publish pkgs older than 11.4 for - # these libs, so 11.2 uses 11.4 packages (the oldest - # available). - - *cudanvtx114 cuda_wheels: specific: @@ -793,15 +679,6 @@ dependencies: - nvidia-cusparse-cu12 - nvidia-cusolver-cu12 - nvidia-nvtx-cu12 - - matrix: - cuda: "11.*" - use_cuda_wheels: "true" - packages: - - nvidia-cublas-cu11 - - nvidia-curand-cu11 - - nvidia-cusparse-cu11 - - nvidia-cusolver-cu11 - - nvidia-nvtx-cu11 # if use_cuda_wheels=false is provided, do not add dependencies on any CUDA wheels # (e.g. for DLFW and pip devcontainers) - matrix: From 5107fbe981fe8be8926427a990491b8c1ad9b3d0 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Thu, 22 May 2025 16:43:17 -0500 Subject: [PATCH 2/6] pre-commit changes --- .../all_cuda-118_arch-aarch64.yaml | 84 ------------------- .../all_cuda-118_arch-x86_64.yaml | 84 ------------------- python/cuopt/pyproject.toml | 2 +- 3 files changed, 1 insertion(+), 169 deletions(-) delete mode 100644 conda/environments/all_cuda-118_arch-aarch64.yaml delete mode 100644 conda/environments/all_cuda-118_arch-x86_64.yaml diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml deleted file mode 100644 index 4875949da4..0000000000 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# This file is generated by `rapids-dependency-file-generator`. -# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -channels: -- rapidsai -- rapidsai-nightly -- conda-forge -- nvidia -- nvidia/label/cuda-12.4.0 -dependencies: -- breathe -- c-compiler -- ccache -- clang-tools=20.1.4 -- clang==20.1.4 -- cmake>=3.30.4 -- cpp-argparse -- cuda-nvtx=11.8 -- cuda-sanitizer-api=11.8.86 -- cuda-version=11.8 -- cudatoolkit -- cudf==25.4.*,>=0.0.0a0 -- cupy>=12.0.0 -- cuvs==25.4.*,>=0.0.0a0 -- cxx-compiler -- cython>=3.0.3 -- doxygen=1.9.1 -- exhale -- fastapi -- folium -- gcc_linux-aarch64=11.* -- geopandas -- gmock -- gtest -- httpx -- ipython -- jsonref==1.1.0 -- libgdal<3.9.0 -- libraft-headers==25.4.* -- librmm==25.4.* -- make -- matplotlib -- msgpack-numpy==0.4.8 -- msgpack-python==1.1.0 -- myst-nb -- myst-parser -- ninja -- notebook -- numba>=0.59.1,<0.61.0a0 -- numpy>=1.23.5,<3.0a0 -- numpydoc -- nvcc_linux-aarch64=11.8 -- pandas>=2.0,<2.2.3dev0 -- pexpect -- pip -- polyline -- pre-commit -- psutil>=5.9,<6.0a0 -- pylibraft==25.4.*,>=0.0.0a0 -- pyrsistent -- pytest-cov -- pytest<8 -- python>=3.10,<3.13 -- raft-dask==25.4.*,>=0.0.0a0 -- rapids-build-backend>=0.3.0,<0.4.0.dev0 -- rapids-dask-dependency==25.4.* -- rapids-logger==0.1.*,>=0.0.0a0 -- requests -- rmm==25.4.*,>=0.0.0a0 -- scikit-build-core>=0.10.0 -- scipy -- sphinx -- sphinx-copybutton -- sphinx-design -- sphinx-markdown-tables -- sphinx_rtd_theme -- sphinxcontrib-openapi -- sphinxcontrib-websupport -- sysroot_linux-aarch64==2.28 -- uvicorn==0.30.* -- pip: - - nvidia_sphinx_theme - - swagger-plugin-for-sphinx - - veroviz -name: all_cuda-118_arch-aarch64 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml deleted file mode 100644 index 9fbf5685e9..0000000000 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# This file is generated by `rapids-dependency-file-generator`. -# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -channels: -- rapidsai -- rapidsai-nightly -- conda-forge -- nvidia -- nvidia/label/cuda-12.4.0 -dependencies: -- breathe -- c-compiler -- ccache -- clang-tools=20.1.4 -- clang==20.1.4 -- cmake>=3.30.4 -- cpp-argparse -- cuda-nvtx=11.8 -- cuda-sanitizer-api=11.8.86 -- cuda-version=11.8 -- cudatoolkit -- cudf==25.4.*,>=0.0.0a0 -- cupy>=12.0.0 -- cuvs==25.4.*,>=0.0.0a0 -- cxx-compiler -- cython>=3.0.3 -- doxygen=1.9.1 -- exhale -- fastapi -- folium -- gcc_linux-64=11.* -- geopandas -- gmock -- gtest -- httpx -- ipython -- jsonref==1.1.0 -- libgdal<3.9.0 -- libraft-headers==25.4.* -- librmm==25.4.* -- make -- matplotlib -- msgpack-numpy==0.4.8 -- msgpack-python==1.1.0 -- myst-nb -- myst-parser -- ninja -- notebook -- numba>=0.59.1,<0.61.0a0 -- numpy>=1.23.5,<3.0a0 -- numpydoc -- nvcc_linux-64=11.8 -- pandas>=2.0,<2.2.3dev0 -- pexpect -- pip -- polyline -- pre-commit -- psutil>=5.9,<6.0a0 -- pylibraft==25.4.*,>=0.0.0a0 -- pyrsistent -- pytest-cov -- pytest<8 -- python>=3.10,<3.13 -- raft-dask==25.4.*,>=0.0.0a0 -- rapids-build-backend>=0.3.0,<0.4.0.dev0 -- rapids-dask-dependency==25.4.* -- rapids-logger==0.1.*,>=0.0.0a0 -- requests -- rmm==25.4.*,>=0.0.0a0 -- scikit-build-core>=0.10.0 -- scipy -- sphinx -- sphinx-copybutton -- sphinx-design -- sphinx-markdown-tables -- sphinx_rtd_theme -- sphinxcontrib-openapi -- sphinxcontrib-websupport -- sysroot_linux-64==2.28 -- uvicorn==0.30.* -- pip: - - nvidia_sphinx_theme - - swagger-plugin-for-sphinx - - veroviz -name: all_cuda-118_arch-x86_64 diff --git a/python/cuopt/pyproject.toml b/python/cuopt/pyproject.toml index 9023a2fe46..da20ec1944 100644 --- a/python/cuopt/pyproject.toml +++ b/python/cuopt/pyproject.toml @@ -33,7 +33,7 @@ requires-python = ">=3.10" dependencies = [ "cudf==25.4.*,>=0.0.0a0", "cuopt-mps-parser==25.5.*,>=0.0.0a0", - "cupy-cuda11x>=12.0.0", + "cupy-cuda12x", "cuvs==25.4.*,>=0.0.0a0", "libcuopt==25.5.*,>=0.0.0a0", "numba>=0.59.1,<0.61.0a0", From 55098bb8ba5e1a8da68b692aff8a44ae1b7c5cc8 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Thu, 22 May 2025 16:55:35 -0500 Subject: [PATCH 3/6] add package name --- .github/workflows/pr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1dba87ed22..1ca9243257 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -160,6 +160,7 @@ jobs: # build for every combination of arch and CUDA version, but only for the latest Python matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) package-type: cpp + package-name: libcuopt build_type: pull-request script: ci/build_wheel_libcuopt.sh wheel-build-cuopt: From 73139ae98bce1ebd4940dd0b785ed840e52e456a Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Thu, 22 May 2025 21:20:19 -0500 Subject: [PATCH 4/6] fix libcuopt wheel 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 8e86f590cd..b5566556e3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06 with: - matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER == "3.12")) build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} date: ${{ inputs.date }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1ca9243257..60557e43fb 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -158,7 +158,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((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER == "3.12")) package-type: cpp package-name: libcuopt build_type: pull-request From ed83c81769875e4cb54a1d48dc34a95cd3249f1e Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Fri, 23 May 2025 07:43:03 -0500 Subject: [PATCH 5/6] fix cuda version for serve test --- .github/workflows/self_hosted_service_test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/self_hosted_service_test.yaml b/.github/workflows/self_hosted_service_test.yaml index b9d3f69802..ce98e199e2 100644 --- a/.github/workflows/self_hosted_service_test.yaml +++ b/.github/workflows/self_hosted_service_test.yaml @@ -44,9 +44,9 @@ jobs: runs-on: linux-amd64-gpu-l4-latest-1 strategy: matrix: - ctk: ["11.8.0"] - linux_ver: ["ubuntu20.04"] - py_ver: ["3.10"] + ctk: ["12.8.0"] + linux_ver: ["ubuntu24.04"] + py_ver: ["3.12"] container: image: "rapidsai/citestwheel:cuda${{ matrix.ctk }}-${{ matrix.linux_ver}}-py${{ matrix.py_ver }}" options: "--network-alias cuopt-service" From e1550c442c53c14dd1b8f6fb7aca459d388cba06 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Fri, 23 May 2025 08:12:58 -0500 Subject: [PATCH 6/6] provide script for the run --- .github/workflows/build.yaml | 2 ++ .github/workflows/pr.yaml | 4 ++++ .github/workflows/test.yaml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b5566556e3..db07d248aa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,6 +35,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + script: ci/build_cpp.sh python-build: needs: [cpp-build] secrets: inherit @@ -45,6 +46,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + script: ci/build_python.sh wheel-build-cuopt-mps-parser: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 60557e43fb..5867c04c76 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -97,6 +97,7 @@ jobs: with: build_type: pull-request matrix_filter: map(select((.CUDA_VER | startswith("12")))) + script: ci/build_cpp.sh conda-cpp-tests: needs: [conda-cpp-build, changed-files] secrets: inherit @@ -105,6 +106,7 @@ jobs: with: build_type: pull-request matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + script: ci/test_cpp.sh conda-python-build: needs: conda-cpp-build secrets: inherit @@ -112,6 +114,7 @@ jobs: with: build_type: pull-request matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + script: ci/build_python.sh conda-python-tests: needs: [conda-python-build, changed-files] secrets: inherit @@ -121,6 +124,7 @@ jobs: run_codecov: false build_type: pull-request matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13")) + script: ci/test_python.sh #docs-build: # needs: checks # secrets: inherit diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 838021886c..a738789431 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,6 +25,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + script: ci/test_cpp.sh conda-cpp-memcheck-tests: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06 @@ -45,6 +46,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + script: ci/test_python.sh wheel-tests-cuopt: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06