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.

Sign up for GitHub

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

Jump to bottom

Support 1.4 + #19

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Support 1.4 + #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dsp/cvxpy_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
from cvxpy import Expression, Problem
from cvxpy.reductions.dcp2cone.atom_canonicalizers import CANON_METHODS

try:
from cvxpy.reductions.dcp2cone.canonicalizers import CANON_METHODS
except ModuleNotFoundError:
from cvxpy.reductions.dcp2cone.atom_canonicalizers import CANON_METHODS

from dsp.problem import is_dsp
from dsp.saddle_extremum import conjugate, saddle_max, saddle_min
Expand Down