Merge branch 'branch-25.10' into fix/nightly-tests

Author: jameslamb

.gitattributes

@@ -1 +1,2 @@
 *.mps linguist-detectable=false
+*.qps linguist-detectable=false

.github/workflows/build.yaml

@@ -111,6 +111,8 @@ jobs:
       package-name: cuopt_mps_parser
       package-type: python
       append-cuda-suffix: false
+      # need 1 build per Python version and arch (but CUDA version doesn't matter so choose the latest)
+      matrix_filter: 'group_by([.ARCH, (.PY_VER |split(".") | map(tonumber))])|map(max_by([(.CUDA_VER|split(".")|map(tonumber))]))'
   wheel-publish-cuopt-mps-parser:
     name: wheel-publish-cuopt-mps-parser
     needs: wheel-build-cuopt-mps-parser
@@ -229,6 +231,8 @@ jobs:
       package-name: cuopt_sh_client
       package-type: python
       append-cuda-suffix: false
+      # only need 1 build (noarch package): this selects amd64, oldest-supported Python, latest-supported CUDA
+      matrix_filter: '[map(select(.ARCH == "amd64")) | min_by((.PY_VER | split(".") | map(tonumber)), (.CUDA_VER | split(".") | map(-tonumber)))]'
   wheel-publish-cuopt-sh-client:
     name: wheel-publish-cuopt-sh-client
     needs: wheel-build-cuopt-sh-client

.github/workflows/build_images.yaml

@@ -36,6 +36,10 @@ on:
       PYTHON_VER:
         required: true
         type: string
+      sha:
+        description: "sha: full git commit SHA to check out"
+        required: true
+        type: string
 
 jobs:
   build:
@@ -52,6 +56,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ inputs.sha }}
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -62,6 +67,9 @@ jobs:
           cp ./LICENSE ./ci/docker/context/LICENSE
           cp ./VERSION ./ci/docker/context/VERSION
           cp ./thirdparty/THIRD_PARTY_LICENSES ./ci/docker/context/THIRD_PARTY_LICENSES
+      - name: Copy Commit SHA
+        run: |
+          git rev-parse HEAD > ./ci/docker/context/COMMIT_SHA
       - name: Login to NGC
         uses: docker/login-action@v3
         with:

.github/workflows/build_test_publish_images.yaml

@@ -32,11 +32,11 @@ on:
         description: 'JSON array of architectures to build for'
       cuda_ver:
         type: string
-        default: '["12.9.0"]'
+        default: '["12.9.0", "13.0.0"]'
         description: 'JSON array of CUDA versions to build for'
       python_ver:
         type: string
-        default: '["3.12.11"]'
+        default: '["3.13.7"]'
         description: 'JSON array of Python versions to build for'
       linux_ver:
         type: string
@@ -80,6 +80,7 @@ jobs:
           ref: ${{ inputs.sha }}
           fetch-depth: 0 # unshallow fetch for setuptools-scm
           persist-credentials: false
+          ref: ${{ inputs.sha }}
 
       - name: Compute matrix
         id: compute-matrix
@@ -129,6 +130,7 @@ jobs:
       IMAGE_TAG_PREFIX: ${{ needs.compute-matrix.outputs.IMAGE_TAG_PREFIX }}
       LINUX_VER: ${{ matrix.linux_ver }}
       PYTHON_VER: ${{ matrix.python_ver }}
+      sha: ${{ inputs.sha }}
 
   build-cuopt-multiarch-manifest:
     name: Build cuopt multiarch manifest
@@ -142,6 +144,7 @@ jobs:
       - name: Checkout code repo
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.sha }}
           fetch-depth: 0
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -184,3 +187,4 @@ jobs:
       CUDA_VER: ${{ matrix.CUDA_VER }}
       PYTHON_VER: ${{ matrix.PYTHON_VER }}
       IMAGE_TAG_PREFIX: ${{ needs.compute-matrix.outputs.IMAGE_TAG_PREFIX }}
+      sha: ${{ inputs.sha }}

.github/workflows/pr.yaml

@@ -35,7 +35,6 @@ jobs:
       - conda-python-tests
       - docs-build
       - wheel-build-libcuopt
-      # - conda-notebook-tests
       - wheel-build-cuopt
       - wheel-tests-cuopt
       - wheel-build-cuopt-server
@@ -168,6 +167,8 @@ jobs:
       package-name: cuopt_mps_parser
       package-type: python
       append-cuda-suffix: false
+      # need 1 build per Python version and arch (but CUDA version doesn't matter so choose the latest)
+      matrix_filter: 'group_by([.ARCH, (.PY_VER |split(".") | map(tonumber))])|map(max_by([(.CUDA_VER|split(".")|map(tonumber))]))'
   wheel-build-libcuopt:
     needs: wheel-build-cuopt-mps-parser
     secrets: inherit
@@ -214,6 +215,9 @@ jobs:
       package-name: cuopt_sh_client
       package-type: python
       append-cuda-suffix: false
+      pure-wheel: true
+      # only need 1 build (noarch package): this selects amd64, oldest-supported Python, latest-supported CUDA
+      matrix_filter: '[map(select(.ARCH == "amd64")) | min_by((.PY_VER | split(".") | map(tonumber)), (.CUDA_VER | split(".") | map(-tonumber)))]'
   wheel-tests-cuopt-server:
     needs: [wheel-build-cuopt-server, changed-files]
     secrets: inherit

.github/workflows/test.yaml

@@ -99,3 +99,15 @@ jobs:
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
       script: ci/test_wheel_cuopt_server.sh
+  conda-notebook-tests:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: ${{ inputs.build_type }}
+      branch: ${{ inputs.branch }}
+      date: ${{ inputs.date }}
+      sha: ${{ inputs.sha }}
+      node_type: "gpu-l4-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:25.10-latest"
+      script: ci/test_notebooks.sh

.github/workflows/test_images.yaml

@@ -27,7 +27,10 @@ on:
       IMAGE_TAG_PREFIX:
         required: true
         type: string
-
+      sha:
+        description: "sha: full git commit SHA to check out"
+        required: true
+        type: string
 
 jobs:
 
@@ -56,6 +59,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ inputs.sha }}
       - name: Test cuopt
         run: |
           bash ./ci/docker/test_image.sh

.gitignore

@@ -66,3 +66,5 @@ docs/cuopt/build
 
 # generated version file
 cpp/include/cuopt/semantic_version.hpp
+!datasets/quadratic_programming
+!datasets/quadratic_programming/**

.pre-commit-config.yaml

@@ -15,7 +15,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 'v5.0.0'
+    rev: 'v6.0.0'
     hooks:
       - id: end-of-file-fixer
         exclude: ^(datasets|helmchart)/.*\.(mps|json|yaml|yml|txt)$
@@ -75,17 +75,17 @@ repos:
         types_or: [file]
         args: ['-fallback-style=none', '-style=file', '-i']
   - repo: https://github.com/rapidsai/dependency-file-generator
-    rev: v1.18.1
+    rev: v1.20.0
     hooks:
       - id: rapids-dependency-file-generator
-        args: ["--clean"]
+        args: ["--clean", "--warn-all", "--strict"]
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: v0.10.0.1
     hooks:
       - id: shellcheck
         args: ["--severity=warning"]
   - repo: https://github.com/rapidsai/pre-commit-hooks
-    rev: v0.6.0
+    rev: v0.7.0
     hooks:
       - id: verify-copyright
         files: |

CONTRIBUTING.md

@@ -70,12 +70,12 @@ library features. The following instructions are for building with a conda envir
 
 CUDA/GPU Runtime:
 
-* CUDA 12.9
+* CUDA 12.0 or higher
 * Volta architecture or better ([Compute Capability](https://docs.nvidia.com/deploy/cuda-compatibility/) >=7.0)
 
 Python:
 
-* Python >=3.10.x, <= 3.12.x
+* Python >=3.10.x, <= 3.13.x
 
 OS:
 
@@ -110,7 +110,7 @@ Please install conda if you don't have it already. You can install [miniforge](h
 # create the conda environment (assuming in base `cuopt` directory)
 # note: cuOpt currently doesn't support `channel_priority: strict`;
 # use `channel_priority: flexible` instead
-conda env create --name cuopt_dev --file conda/environments/all_cuda-128_arch-x86_64.yaml
+conda env create --name cuopt_dev --file conda/environments/all_cuda-130_arch-x86_64.yaml
 # activate the environment
 conda activate cuopt_dev
 ```