Prep Patch/1.3.2 #2151

phschiele · 2023-06-22T00:21:31Z

The following PRs have been merged since the last patch:

Link	Type	1.3.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	✔
#2117	Feat
#2130	Bug
#2131	Bug	✔
#2086	Bug	✔
#2134	Bug	✔
#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	✔

* Set up ruff * Add isort * Update action * Use suggested action * Push error to check action * Remove pre-commit action * Remove demonstration * Update pragmas * Update webdocs * Update solver imports * Update pyproject.toml

* 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

This resolves GitHub issue #2092.

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>

… starting vectors in eigsh (#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>

CLAassistant · 2023-06-22T00:21:39Z

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.
7 out of 8 committers have signed the CLA.

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

github-actions · 2023-06-22T00:27:45Z

Benchmarks that have stayed the same:

   before           after         ratio
 [4a0d2612]       [6bc6fb1c]
      26.8±0s          27.4±0s     1.02  cvar_benchmark.CVaRBenchmark.time_compile_problem
      4.02±0s          4.05±0s     1.01  simple_LP_benchmarks.SimpleFullyParametrizedLPBenchmark.time_compile_problem
      8.57±0s          8.62±0s     1.01  huber_regression.HuberRegression.time_compile_problem
      40.9±0s          41.1±0s     1.00  sdp_segfault_1132_benchmark.SDPSegfault1132Benchmark.time_compile_problem
      8.23±0s          8.25±0s     1.00  semidefinite_programming.SemidefiniteProgramming.time_compile_problem
      8.74±0s          8.76±0s     1.00  optimal_advertising.OptimalAdvertising.time_compile_problem
      9.94±0s          9.93±0s     1.00  svm_l1_regularization.SVMWithL1Regularization.time_compile_problem
      1.67±0s          1.66±0s     0.99  simple_LP_benchmarks.SimpleScalarParametrizedLPBenchmark.time_compile_problem
      21.4±0s          21.2±0s     0.99  simple_LP_benchmarks.SimpleLPBenchmark.time_compile_problem

rileyjmurray · 2023-06-22T02:07:39Z

That's a nice collection! I love making a table like this, @phschiele.

PTNobel · 2023-06-22T06:00:02Z

I think #2047 should be included; it was tagged for backporting but did not get included in the 1.3.1 release at the request of 364a, since 1.3.1 came out during the final exam and that function's previous behaviour was described in a question on the final.

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

phschiele · 2023-06-24T17:34:48Z

I have included #2047 as suggested by @PTNobel, and all tests are passing now.

There are 3 PRs where we could discuss whether or not it makes sense to backport them:

fix: remove reductions import in top-level __init__.py #2105
Removes reductions from the top level. This was labelled as a bug, but we might consider keeping the imports as if for backports, not to break code on the same minor version.
Support SDPs for Clarabel ver >= 0.5.0 #2108
This is a new feature, but we might consider including it in the 1.3 patch to enable faster adoption of Clarabel before including it in future versions as a dependency
setup.py: Remove setup_requires, remove setuptools from `install_requires' #2118
This removes a deprecated install method and is labelled to be backported. This could break some installations.

Feel free to hover over the PRs in the table if you spot anything else that should be considered for backporting.

rileyjmurray · 2023-06-24T17:54:30Z

I can’t review right now but I will have comments so please wait before releasing

…

SteveDiamond · 2023-06-24T23:43:54Z

I have included #2047 as suggested by @PTNobel, and all tests are passing now.

There are 3 PRs where we could discuss whether or not it makes sense to backport them:

fix: remove reductions import in top-level init.py #2105
Removes reductions from the top level. This was labelled as a bug, but we might consider keeping the imports as if for backports, not to break code on the same minor version.

Support SDPs for Clarabel ver >= 0.5.0 #2108
This is a new feature, but we might consider including it in the 1.3 patch to enable faster adoption of Clarabel before including it in future versions as a dependency

setup.py: Remove setup_requires, remove setuptools from `install_requires' #2118
This removes a deprecated install method and is labelled to be backported. This could break some installations.

Feel free to hover over the PRs in the table if you spot anything else that should be considered for backporting.

I'm in favor of backporting #2108 to 1.3 and leaving the others for 1.4. But I don't feel strongly about it.

rileyjmurray · 2023-06-24T23:53:35Z

Here are my two cents on each of the three PRs you mentioned, @phschiele.

#2105

Removes reductions from the top level. This was labeled as a bug, but we might consider keeping the imports as if for backports, not to break code on the same minor version.

Let's not risk breaking code unless we have to. While it's fine to call this a bug, it's not a "correctness bug" that a casual user might encounter. So I would prefer to not backport this PR.

#2108

This is a new feature, but we might consider including it in the 1.3 patch to enable faster adoption of Clarabel before including it in future versions as a dependency

I would not be in favor of adding this to a patch. My preference would be something like "update Clarabel's interface in 1.4, make Clarabel a dependency in 1.5, and make Clarabel high on our solver priority list in 1.6." With our current release cadence, that would take a long time, but there is no reason why we can't make releases more often. If I recall correctly, @SteveDiamond was in favor of releasing as often as once every three months back when we adopted semantic versioning.

#2118

This removes a deprecated install method and is labeled to be backported. This could break some installations.

My thoughts here are the same as for #2105; let's not risk breaking code unless there's a compelling reason to do so.

) * 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>

SteveDiamond · 2023-06-26T16:10:05Z

Please include #2160.

* 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>

sonarcloud · 2023-06-26T21:17:26Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

86.6% Coverage
4.4% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

phschiele · 2023-06-26T21:25:59Z

Merging here as discussed @SteveDiamond @rileyjmurray @PTNobel.
Sonar failures are related to some duplication between (deprecated) conv and convolve.

phschiele and others added 8 commits March 29, 2023 10:11

Introduce ruff linter (#2049)

ab4fa23

* Set up ruff * Add isort * Update action * Use suggested action * Push error to check action * Remove pre-commit action * Remove demonstration * Update pragmas * Update webdocs * Update solver imports * Update pyproject.toml

Fix scip timelimit no solution (#2084)

c278c8e

* 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 devcontainer support (#2088)

9e490d3

* Adds minimal devcontainer setup * Adds docs

Correct categorization of tr_inv atom. (#2123)

e6f9318

This resolves GitHub issue #2092.

Map imprecise status to optimal_inaccurate (#2134)

3730556

Merge 2126

f42967e

SteveDiamond and others added 2 commits June 24, 2023 12:17

Fix conv and add convolve (#2047)

d9aab43

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

Merge 2080

d48a62c

SteveDiamond and others added 2 commits June 26, 2023 18:32

remove github banner (#2160)

db0d258

Update scipy_wrapper (#2159)

9d13f9a

* 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 mentioned this pull request Jun 26, 2023

[CI] PR benchmark against base branch #2161

Merged

9 tasks

PR benchmark against base branch (#2161)

c2291e8

phschiele merged commit 5ec9d88 into release/1.3.x Jun 26, 2023
50 of 51 checks passed

Paulnkk mentioned this pull request Jul 15, 2023

Prep Patch/1.2.5 #2184

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prep Patch/1.3.2 #2151

Prep Patch/1.3.2 #2151

phschiele commented Jun 22, 2023 •

edited

CLAassistant commented Jun 22, 2023 •

edited

github-actions bot commented Jun 22, 2023 •

edited

rileyjmurray commented Jun 22, 2023

PTNobel commented Jun 22, 2023

phschiele commented Jun 24, 2023 •

edited

rileyjmurray commented Jun 24, 2023 via email

SteveDiamond commented Jun 24, 2023

rileyjmurray commented Jun 24, 2023

SteveDiamond commented Jun 26, 2023

sonarcloud bot commented Jun 26, 2023

phschiele commented Jun 26, 2023

Prep Patch/1.3.2 #2151

Prep Patch/1.3.2 #2151

Conversation

phschiele commented Jun 22, 2023 • edited

CLAassistant commented Jun 22, 2023 • edited

github-actions bot commented Jun 22, 2023 • edited

rileyjmurray commented Jun 22, 2023

PTNobel commented Jun 22, 2023

phschiele commented Jun 24, 2023 • edited

rileyjmurray commented Jun 24, 2023 via email

SteveDiamond commented Jun 24, 2023

rileyjmurray commented Jun 24, 2023

#2105

#2108

#2118

SteveDiamond commented Jun 26, 2023

sonarcloud bot commented Jun 26, 2023

phschiele commented Jun 26, 2023

phschiele commented Jun 22, 2023 •

edited

CLAassistant commented Jun 22, 2023 •

edited

github-actions bot commented Jun 22, 2023 •

edited

phschiele commented Jun 24, 2023 •

edited