Skip to content

Commit

Permalink
[workspace] Upgrade scs to latest release 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BetsyMcPhail committed Feb 2, 2022
1 parent 139f6d0 commit c0f4f3e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions solvers/scs_solver.cc
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ void ScsSolver::DoSolve(
// This guard will free cone, scs_problem_data, and scs_stgs (together with
// their instantiated members) upon return from the DoSolve function.
ScopeExit scs_free_guard([&cone, &scs_problem_data, &scs_stgs]() {
scs_free_data(scs_problem_data, cone, scs_stgs);
_scs_free_data(scs_problem_data, cone, scs_stgs);
});

// Set the parameters to default values.
Expand Down Expand Up @@ -797,7 +797,7 @@ void ScsSolver::DoSolve(

ScsSolution* scs_sol =
static_cast<ScsSolution*>(scs_calloc(1, sizeof(ScsSolution)));
ScopeExit sol_guard([&scs_sol]() { scs_free_sol(scs_sol); });
ScopeExit sol_guard([&scs_sol]() { _scs_free_sol(scs_sol); });

ScsSolverDetails& solver_details =
result->SetSolverDetailsType<ScsSolverDetails>();
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/scs/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ def scs_repository(
name = name,
repository = "cvxgrp/scs",
# When updating this commit, see drake/tools/workspace/qdldl/README.md.
commit = "v3.0.0",
sha256 = "95ab61495db72b18d6bb690cd2ae2ce88134d078c473da6cb8750857ea17f732", # noqa
commit = "3.1.0",
sha256 = "90a7e58364ed3ea3375945a7f6f013de81c46100df80664a18f1c9b45a56be9c", # noqa
build_file = "@drake//tools/workspace/scs:package.BUILD.bazel",
patches = [
# Fix some include paths for our build of QDLDL.
Expand Down

0 comments on commit c0f4f3e

Please sign in to comment.