-
Notifications
You must be signed in to change notification settings - Fork 116
add a simple smoketest for cvxpy integration #199
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.
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
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
a286991
add a simple smoketest for cvxpy
tmckayus 7acdd56
Merge branch 'branch-25.08' into cvxpyunit
jameslamb a609cfc
refactor tests
jameslamb 1a71546
add 3 minute timeout on tests
jameslamb 8c58eb3
use pip wheel instead of build
jameslamb 1f449c2
Merge branch 'branch-25.08' of github.com:NVIDIA/cuopt into cvxpyunit
jameslamb 6eee928
Merge branch 'branch-25.08' into cvxpyunit
rgsl888prabhu 84a0a64
Merge branch 'branch-25.08' into cvxpyunit
jameslamb d62cb03
move cvxpy tests back into their own file
jameslamb b0783e2
Merge branch 'branch-25.08' into cvxpyunit
rgsl888prabhu 43b69c1
fix cvxpy target branch
rgsl888prabhu 8ccfa80
update test script
rgsl888prabhu ac2806d
fix tests
rgsl888prabhu 6805554
Merge branch 'branch-25.08' into cvxpyunit
rgsl888prabhu a2d14fc
debug
rgsl888prabhu 0dd27f6
Merge branch 'branch-25.08' into cvxpyunit
rgsl888prabhu d85fd8e
fix style
rgsl888prabhu a8b9323
Merge branch 'branch-25.08' into cvxpyunit
rgsl888prabhu 23b712f
Merge branch 'branch-25.08' into cvxpyunit
rgsl888prabhu 6fd9f84
Merge branch 'branch-25.08' into cvxpyunit
rgsl888prabhu 355bfd4
Update ci/thirdparty-testing/run_cvxpy_tests.sh
rgsl888prabhu 99d0056
Update problem.cu
rgsl888prabhu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| #!/bin/bash | ||
| # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| set -e -u -o pipefail | ||
|
|
||
| echo "building 'cvxpy' from source" | ||
| git clone https://github.com/cvxpy/cvxpy.git | ||
| pushd ./cvxpy || exit 1 | ||
| pip wheel \ | ||
| -w dist \ | ||
| . | ||
|
|
||
| # NOTE: installing cvxpy[CUOPT] alongside CI artifacts is helpful to catch dependency conflicts | ||
| echo "installing 'cvxpy' with cuopt" | ||
| python -m pip install \ | ||
| --constraint "${PIP_CONSTRAINT}" \ | ||
| --extra-index-url=https://pypi.nvidia.com \ | ||
| --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple \ | ||
| 'pytest-error-for-skips>=2.0.2' \ | ||
| "$(echo ./dist/cvxpy*.whl)[CUOPT,testing]" | ||
|
|
||
rgsl888prabhu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # ensure that environment is still consistent (i.e. cvxpy requirements do not conflict with cuopt's) | ||
| pip check | ||
|
|
||
| echo "running 'cvxpy' tests" | ||
| timeout 3m python -m pytest \ | ||
| --verbose \ | ||
| --capture=no \ | ||
| --error-for-skips \ | ||
| -k "TestCUOPT" \ | ||
| ./cvxpy/tests/test_conic_solvers.py | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jameslamb We would have more integration tests in future, should we move few items to be partly into a bash script and run it from there to keep the test_wheel_cuopt.sh simple ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure we can, and to be fair that's how @tmckayus had it originally before I pushed commits here.
Let me tell you why I did it this way. I was mainly concerned about making sure that the
pip installthat installscvxpyuses the just-built-in-this-CI-runcuoptpackages.Doing it in 1 script like this makes that easy to guarantee, because I can just reference variables from the same scope and packages downloaded a few lines higher up. Like this:
If you want to defer all the
cvxpystuff to a separate script, like Trevor had it before, it'd involve some changes to how packages are downloaded.I can do that here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we might be adding few more smoke tests to this, I felt the script might become too huge and it might not be scaled. Yeah, lets move these to a folder "thirdparty-testing" and add a script there to trigger test. Please let me know if your hands are full, I can work on this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I will push changes here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just pushed changes moving
cvxpytests to their own file, as @tmckayus had originally (but using the namethirdparty-testing/you asked for).Hopefully this will set up a pattern that can be reliably replicated when other integration tests like this are added.
I will check back in an hour or so to be sure this worked. I especially want to see evidence in the logs that the just-built-in-CI
cuopt,cuopt-mps-parser, etc. wheels were used, not packages downloaded from the nightly index.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @jameslamb