Skip to content

Commit

Permalink
no longer impose ECOS solver for SSNB, use new CVXPY default (Clarabel)
Browse files Browse the repository at this point in the history
  • Loading branch information
eloitanguy committed Nov 18, 2024
1 parent 68e3926 commit f95d4d7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ot/mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def nearest_brenier_potential_fit(
- c3 * (G[j] - G[i]).T @ (X[j] - X[i])
]
problem = cvx.Problem(objective, constraints)
problem.solve(solver=cvx.ECOS)
problem.solve()

Check warning on line 176 in ot/mapping.py

View check run for this annotation

Codecov / codecov/patch

ot/mapping.py#L176

Added line #L176 was not covered by tests
phi_val, G_val = phi.value, G.value
it_log_dict = {
"solve_time": problem.solver_stats.solve_time,
Expand Down Expand Up @@ -368,7 +368,7 @@ def nearest_brenier_potential_predict_bounds(
- c3 * (G[j] - G_l_y).T @ (X[j] - Y[y_idx])
]
problem = cvx.Problem(objective, constraints)
problem.solve(solver=cvx.ECOS)
problem.solve()

Check warning on line 371 in ot/mapping.py

View check run for this annotation

Codecov / codecov/patch

ot/mapping.py#L371

Added line #L371 was not covered by tests
phi_lu[0, y_idx] = phi_l_y.value
G_lu[0, y_idx] = G_l_y.value
if log:
Expand All @@ -395,7 +395,7 @@ def nearest_brenier_potential_predict_bounds(
- c3 * (G_u_y - G[i]).T @ (Y[y_idx] - X[i])
]
problem = cvx.Problem(objective, constraints)
problem.solve(solver=cvx.ECOS)
problem.solve()

Check warning on line 398 in ot/mapping.py

View check run for this annotation

Codecov / codecov/patch

ot/mapping.py#L398

Added line #L398 was not covered by tests
phi_lu[1, y_idx] = phi_u_y.value
G_lu[1, y_idx] = G_u_y.value
if log:
Expand Down

0 comments on commit f95d4d7

Please sign in to comment.