Prep Patch/1.2.5 #2184

Paulnkk · 2023-07-15T19:44:38Z

The following PRs have been merged since the last patch:

Link	Type	1.3.x	1.2.x	Comment
#2047	Bug	✔	✔
#2073	Other
#2078	Doc
#2085	Doc
#2080	Bug	✔	✔
#2081	Other
#2084	Bug	✔	✔
#2057	Feat
#2088	Other	✔	✔
#2069	Feat
#2094	Other
#2103	Feat
#2105	Bug (?)
#2110	Feat
#2111	Other
#2113	Feat
#2108	Feat (?)
#2118	Other (?)
#2120	Other
#2116	Feat
#2091	Feat
#2123	Bug	✔		`tr_inv` not in 1.2
#2117	Feat
#2130	Bug
#2131	Bug	✔	✔
#2086	Bug	✔	✔
#2134	Bug	✔		COPT not in 1.2
#2127	Feat
#2126	Bug	✔	✔
#2119	Feat
#2141	Feat
#2139	Feat
#2146	Feat
#2147	Feat
#2097	Feat
#2125	Feat
#1821	Bug	✔	✔	resolves (?) #1747
#2160	Bug	✔	✔
#2159	Bug	✔	✔
#2161	Bug	✔		Not in 1.2

* Add condition timelimit and no solution * Add timelimit example * Add unit test timelimit and no solution * attempt * Update timelimit * try to fix windows * remove failing test --------- Co-authored-by: Steven Diamond <steven@gridmatic.com>

* Adds minimal devcontainer setup * Adds docs

* make conv more like np.convolve * more tests * make backwards compatible * add convolve, deprecate conv * added convolve, deprecated conv * update docs

* Add condition timelimit and no solution * Add timelimit example * Add unit test timelimit and no solution * attempt * Update timelimit * try to fix windows * remove failing test --------- Co-authored-by: Steven Diamond <steven@gridmatic.com>

Update solver_test_helpers.py to include a cone program with SDP and power cone constraints. Correct a bug in PowCone3D.residual, which should have been declared as a property but was not. --------- Co-authored-by: Steven Diamond <steven@gridmatic.com>

…y#2131)" This reverts commit e68445e.

… starting vectors in eigsh (cvxpy#2086) * explicitly generate the starting vector in our calls to eigsh; generate the vector based on a fixed random stream. * Add special casing for diagonal matrices --------- Co-authored-by: Riley Murray <rileyjmurray@users.noreply.github.com>

* got new mosek simplex test passing * revert clarabel intf change

…xpy#1821) * update CBC our interface (which passes through cylp) so that the user can configure the underlying CLP solver. * write tests to verify that changing CLP tolerance settings will change CLP's behavior predictably. * write tests to verify that changing logLevel affects the amount of material logged to console. (This was hard!) * remove deprecated old test code * replace TestCBC's use of unittest.skipUnless with appropriately modified pytest.mark.skipif. --------- Co-authored-by: Riley Murray <rileyjmurray@users.noreply.github.com>

* update spwrapper * Update cvxpy/interface/scipy_wrapper.py Co-authored-by: Isaac Virshup <ivirshup@gmail.com> --------- Co-authored-by: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

CLAassistant · 2023-07-15T19:44:45Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 6 committers have signed the CLA.

✅ phschiele
✅ allenlawrence94
✅ dcajasn
✅ bkurtz
✅ SteveDiamond
❌ Paulnkk
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

rileyjmurray · 2023-07-15T20:24:08Z

@Paulnkk PowCone3D is in 1.2.0, so #2131 should be added to this PR.

Update solver_test_helpers.py to include a cone program with SDP and power cone constraints. Correct a bug in PowCone3D.residual, which should have been declared as a property but was not. --------- Co-authored-by: Steven Diamond <steven@gridmatic.com>

Paulnkk · 2023-07-16T13:42:54Z

@Paulnkk PowCone3D is in 1.2.0, so #2131 should be added to this PR.

@rileyjmurray Thanks for the comment! I added the commit and unfortunately, I receive the following error as before (for this reason I have not included this commit):

Additionally, I have to apologize that I made the cherry picks on patch/1.2.5 and directly merged into release/1.2.x and pushed on that branch. If this is not optimal, I can create a new PR and request a merge from patch/1.2.5 into release/1.2.x directly (sorry for those kind of mistakes it is my first PR of that kind but very happy to work on that!)

rileyjmurray · 2023-07-17T00:06:42Z

@Paulnkk I suspect there was a bug where PowCone3D was not exposed in CVXPY's top-level namespace in 1.2.x; it should have been.

Paulnkk · 2023-07-17T15:11:12Z

@rileyjmurray What is the best way to deal with this issue? I can make a separate commit in patch/1.2.5 and try to solve the problem, does that work ?

phschiele · 2023-07-17T16:53:20Z

@Paulnkk thanks for putting this together. Let me clean up this one remaining issue here. You can get started on the 1.1 patch if you like.

phschiele

Looks good, thanks @Paulnkk!
I compared it against the 1.3 patch, it is identical for the fixes that we backport.
I removed some code you added for the mosek interface which were not part of the bugfixes. Now all tests work for me locally.

Suggestion to release as soon as the CI is fixed.

@Paulnkk Do you also have a similar PR for the 1.1.x release?

Paulnkk · 2023-07-30T10:15:18Z

@phschiele Yes, I am currently working on it and plan to release the PR today evening or tomorrow 👍🏻

SteveDiamond · 2023-08-07T02:13:09Z

Not sure why this won't run CI. Going to go ahead and merge and fix any issues later.

phschiele and others added 13 commits March 29, 2023 10:23

Introduce ruff linter (cvxpy#2049)

a6ccc7a

Adds devcontainer support (cvxpy#2088)

d096426

* Adds minimal devcontainer setup * Adds docs

Fix conv and add convolve (cvxpy#2047)

3d29dd5

* make conv more like np.convolve * more tests * make backwards compatible * add convolve, deprecate conv * added convolve, deprecated conv * update docs

Cherry-pick cvxpy#2080

67c80f4

Revert "Fixes to PowCone3D and updates to test_conic_solvers.py (cvxp…

c2bc968

…y#2131)" This reverts commit e68445e.

Fix bug with calling Mosek simplex solver (cvxpy#2126)

f109edf

* got new mosek simplex test passing * revert clarabel intf change

remove github banner (cvxpy#2160)

4d145e8

Update scipy_wrapper (cvxpy#2159)

6a3e6c5

* update spwrapper * Update cvxpy/interface/scipy_wrapper.py Co-authored-by: Isaac Virshup <ivirshup@gmail.com> --------- Co-authored-by: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

phschiele added 4 commits July 29, 2023 12:52

Explicit import of power cone 3d

85fa804

Only port bug fix for mosek

a269208

Only port bug fix for mosek

de60d9b

Only port bug fix for mosek

36667ab

phschiele approved these changes Jul 29, 2023

View reviewed changes

SteveDiamond merged commit 470e589 into cvxpy:release/1.2.x Aug 7, 2023
8 of 17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prep Patch/1.2.5 #2184

Prep Patch/1.2.5 #2184

Paulnkk commented Jul 15, 2023 •

edited by phschiele

CLAassistant commented Jul 15, 2023 •

edited

rileyjmurray commented Jul 15, 2023

Paulnkk commented Jul 16, 2023

rileyjmurray commented Jul 17, 2023

Paulnkk commented Jul 17, 2023

phschiele commented Jul 17, 2023

phschiele left a comment

Paulnkk commented Jul 30, 2023

SteveDiamond commented Aug 7, 2023

Prep Patch/1.2.5 #2184

Prep Patch/1.2.5 #2184

Conversation

Paulnkk commented Jul 15, 2023 • edited by phschiele

CLAassistant commented Jul 15, 2023 • edited

rileyjmurray commented Jul 15, 2023

Paulnkk commented Jul 16, 2023

rileyjmurray commented Jul 17, 2023

Paulnkk commented Jul 17, 2023

phschiele commented Jul 17, 2023

phschiele left a comment

Choose a reason for hiding this comment

Paulnkk commented Jul 30, 2023

SteveDiamond commented Aug 7, 2023

Paulnkk commented Jul 15, 2023 •

edited by phschiele

CLAassistant commented Jul 15, 2023 •

edited