Skip to content

Commit b1f7657

Browse files
authored
Merge branch 'release/26.04' into setppc-presolve
2 parents 4caf1f1 + 7dc755e commit b1f7657

3 files changed

Lines changed: 79 additions & 0 deletions

File tree

ci/test_wheel_cuopt.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,6 @@ timeout 30m ./ci/run_cuopt_pytests.sh --verbose --capture=no
7777
if [[ "${RAPIDS_BUILD_TYPE}" == "nightly" ]]; then
7878
./ci/thirdparty-testing/run_jump_tests.sh
7979
./ci/thirdparty-testing/run_cvxpy_tests.sh
80+
./ci/thirdparty-testing/run_pulp_tests.sh
81+
./ci/thirdparty-testing/run_pyomo_tests.sh
8082
fi
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/bash
2+
# SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
set -e -u -o pipefail
6+
7+
rapids-logger "building 'pulp' from source and running cuOpt tests"
8+
9+
if [ -z "${PIP_CONSTRAINT:-}" ]; then
10+
rapids-logger "PIP_CONSTRAINT is not set; ensure ci/test_wheel_cuopt.sh (or equivalent) has set it so cuopt wheels are used."
11+
exit 1
12+
fi
13+
14+
git clone --depth 1 https://github.com/coin-or/pulp.git
15+
pushd ./pulp || exit 1
16+
17+
# Install PuLP in editable form so it uses the environment's cuopt (from PIP_CONSTRAINT)
18+
python -m pip install \
19+
--constraint "${PIP_CONSTRAINT}" \
20+
--extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple \
21+
pytest \
22+
-e .
23+
24+
pip check
25+
26+
rapids-logger "running PuLP tests (cuOpt-related)"
27+
# PuLP uses pytest; run only tests that reference cuopt/CUOPT
28+
# Exit code 5 = no tests collected; then try run_tests.py which detects solvers (including cuopt)
29+
pytest_rc=0
30+
timeout 5m python -m pytest \
31+
--verbose \
32+
--capture=no \
33+
-k "cuopt or CUOPT" \
34+
pulp/tests/ || pytest_rc=$?
35+
36+
if [ "$pytest_rc" -eq 5 ]; then
37+
rapids-logger "No pytest -k cuopt tests found; running PuLP run_tests.py (solver auto-detection, includes cuopt)"
38+
timeout 5m python pulp/tests/run_tests.py
39+
pytest_rc=$?
40+
fi
41+
42+
popd || exit 1
43+
exit "$pytest_rc"
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
# SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
set -e -u -o pipefail
6+
7+
rapids-logger "building 'pyomo' from source and running cuOpt tests"
8+
9+
if [ -z "${PIP_CONSTRAINT:-}" ]; then
10+
rapids-logger "PIP_CONSTRAINT is not set; ensure ci/test_wheel_cuopt.sh (or equivalent) has set it so cuopt wheels are used."
11+
exit 1
12+
fi
13+
14+
git clone --depth 1 https://github.com/Pyomo/pyomo.git
15+
pushd ./pyomo || exit 1
16+
17+
# Install Pyomo in editable form so it uses the environment's cuopt (from PIP_CONSTRAINT)
18+
python -m pip install \
19+
--constraint "${PIP_CONSTRAINT}" \
20+
--extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple \
21+
pytest \
22+
-e .
23+
24+
pip check
25+
26+
rapids-logger "running Pyomo tests (cuopt_direct / cuOpt-related)"
27+
# Run only tests that reference cuopt (cuopt_direct solver)
28+
timeout 5m python -m pytest \
29+
--verbose \
30+
--capture=no \
31+
-k "cuopt or CUOPT" \
32+
pyomo/solvers/tests/
33+
34+
popd || exit 1

0 commit comments

Comments
 (0)