Skip to content

Commit d58a729

Browse files
Updating acados recompilation to be a boolean
1 parent 01e2722 commit d58a729

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

mm_control/scripts/mpc_generate_c_code.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
config["controller"]["acados"]["name"] = args.name
2828

2929
config["controller"]["acados"]["cython"]["enabled"] = True
30-
config["controller"]["acados"]["cython"]["action"] = "generate"
30+
config["controller"]["acados"]["cython"]["recompile"] = True
3131

3232
ctrl_config = config["controller"]
3333
control_class = getattr(MPC, ctrl_config["type"], None)

mm_control/src/mm_control/MPC.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,11 +463,11 @@ def _construct(self, costs, constraints, num_terminal_cost, name="MM"):
463463
# Construct AcadosOCPSolver
464464
json_file_name = str(self.output_dir / f"acados_ocp_{name}.json")
465465
if self.params["acados"]["cython"]["enabled"]:
466-
if self.params["acados"]["cython"]["action"] == "generate":
466+
if self.params["acados"]["cython"]["recompile"]:
467467
AcadosOcpSolver.generate(ocp, json_file=json_file_name)
468468
AcadosOcpSolver.build(ocp.code_export_directory, with_cython=True)
469469
ocp_solver = AcadosOcpSolver.create_cython_solver(json_file_name)
470-
elif self.params["acados"]["cython"]["action"] == "load":
470+
else:
471471
ocp_solver = AcadosOcpSolver(
472472
ocp, json_file=json_file_name, build=False, generate=False
473473
)

mm_control/tests/test_mpc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ controller:
112112
name: "MM"
113113
cython:
114114
enabled: False
115-
action: "generate"
115+
recompile: True
116116
raise_exception_on_failure: False
117117
use_custom_hess: True
118118
use_terminal_cost: False

mm_run/config/controller/MPC.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ controller:
119119
name: "MM"
120120
cython:
121121
enabled: True
122-
action: "load" # load or generate
122+
recompile: False
123123
raise_exception_on_failure: False
124124
use_custom_hess: True
125125
use_terminal_cost: False

mm_run/config/controller/MPC_SIM.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ controller:
101101
acados:
102102
cython:
103103
enabled: True
104-
action: "load" # load or generate
104+
recompile: False
105105
raise_exception_on_failure: False
106106
use_custom_hess: True
107107
use_terminal_cost: False

mm_utils/src/mm_utils/plotting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def __init__(self, data, config=None, process=True):
6363
)
6464

6565
config["controller"]["acados"]["cython"]["enabled"] = True
66-
config["controller"]["acados"]["cython"]["action"] = "load"
66+
config["controller"]["acados"]["cython"]["recompile"] = False
6767
self.controller = control_class(config["controller"])
6868
self.model_interface = self.controller.model_interface
6969

0 commit comments

Comments
 (0)