Skip to content
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

Add optional package cvxpy, update cylp, add CVXPY MIP backend #35120

Merged
merged 51 commits into from
Mar 26, 2023

Conversation

mkoeppe
Copy link
Member

@mkoeppe mkoeppe commented Feb 13, 2023

πŸ“š Description

Fixes #34251

πŸ“ Checklist

  • I have made sure that the title is self-explanatory and the description concisely explains the PR.
  • I have linked an issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation accordingly.

βŒ› Dependencies

mkoeppe and others added 30 commits October 2, 2022 15:41
…LinearProgram(solver="CVXPY/SciPy/HiGHS") etc.
@codecov-commenter
Copy link

codecov-commenter commented Feb 14, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (c00e6c2) 88.62% compared to head (9f75342) 88.61%.

❗ Current head 9f75342 differs from pull request most recent head 0324f53. Consider uploading reports for the commit 0324f53 to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #35120      +/-   ##
===========================================
- Coverage    88.62%   88.61%   -0.01%     
===========================================
  Files         2148     2148              
  Lines       398855   398855              
===========================================
- Hits        353480   353452      -28     
- Misses       45375    45403      +28     

see 25 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

β˜” View full report in Codecov by Sentry.
πŸ“’ Do you have feedback about the report comment? Let us know in this issue.

@dimpase
Copy link
Member

dimpase commented Feb 21, 2023

are there any tests to see this working?

@mkoeppe
Copy link
Member Author

mkoeppe commented Feb 21, 2023

In addition to the tests in cvxpy_backend, you can do echo "default_mip_solver('cvxpy')" > ~/.sage/init-doctests.sage and run ./sage -t src/sage/{combinat,graphs,numerical}

Copy link
Member

@dimpase dimpase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mkoeppe
Copy link
Member Author

mkoeppe commented Feb 22, 2023

Thank you!

@vbraun
Copy link
Member

vbraun commented Mar 19, 2023

Merge conflict

@mkoeppe
Copy link
Member Author

mkoeppe commented Mar 19, 2023

trivial merge, back to positive review

@vbraun
Copy link
Member

vbraun commented Mar 23, 2023

I though there is now a CI test that builds the PDF docs? Because this ticket doesn't build because of an invisible U+200B:

[sagemath_doc_pdf-none] LaTeX Warning: Hyper reference `six:spkg-six' on page 75 undefined on input lin
[sagemath_doc_pdf-none] e 6824.
[sagemath_doc_pdf-none] 
[sagemath_doc_pdf-none] [75]
[sagemath_doc_pdf-none] 
[sagemath_doc_pdf-none] ! Package inputenc Error: Unicode character ​ (U+200B)
[sagemath_doc_pdf-none] (inputenc)                not set up for use with LaTeX.
[sagemath_doc_pdf-none] 
[sagemath_doc_pdf-none] See the inputenc package documentation for explanation.
[sagemath_doc_pdf-none] Type  H <return>  for immediate help.
[sagemath_doc_pdf-none]  ...                                              
[sagemath_doc_pdf-none]                                                   
[sagemath_doc_pdf-none] l.6897 ​
[sagemath_doc_pdf-none]           https://www.gnu.org/licenses/license\sphinxhyphen{}list.html\#EPL2;
[sagemath_doc_pdf-none] ? 
[sagemath_doc_pdf-none] ! Emergency stop.
[sagemath_doc_pdf-none]  ...                                              
[sagemath_doc_pdf-none]                                                   
[sagemath_doc_pdf-none] l.6897 ​
[sagemath_doc_pdf-none]           https://www.gnu.org/licenses/license\sphinxhyphen{}list.html\#EPL2;
[sagemath_doc_pdf-none] !  ==> Fatal error occurred, no output PDF file produced!

@mkoeppe
Copy link
Member Author

mkoeppe commented Mar 23, 2023

I though there is now a CI test that builds the PDF docs?

That PR #35169 is still waiting for review

@dimpase
Copy link
Member

dimpase commented Mar 23, 2023

here is the problem:

--- a/build/pkgs/cylp/SPKG.rst
+++ b/build/pkgs/cylp/SPKG.rst
@@ -9,7 +9,11 @@ A Python interface for CLP, CBC, and CGL
 License
 -------

-Eclipse Public License
+Eclipse Public License (EPL) version 2 (without a Secondary Licenses Notice).
+
+Note: This license is incompatible with the GPL according to
+<200b>https://www.gnu.org/licenses/license-list.html#EPL2;
+see also the discussion in :trac:`26511`.
 

@github-actions
Copy link

Documentation preview for this PR is ready! πŸŽ‰
Built with commit: 0324f53

@vbraun vbraun merged commit b2e6ba7 into sagemath:develop Mar 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add optional package cvxpy, update cylp, add CVXPY MIP backend
6 participants