fix building

pull/22784/head
Joost Wooning 4 years ago
parent 5cd84e93c1
commit a882dcafef
  1. 1
      selfdrive/controls/lib/lateral_mpc_lib/SConscript
  2. 2
      selfdrive/controls/lib/lateral_mpc_lib/lat_mpc.py
  3. 1
      selfdrive/controls/lib/longitudinal_mpc_lib/SConscript
  4. 2
      selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py

@ -33,6 +33,7 @@ generated_files = [
f'{gen}/main_lat.c',
f'{gen}/acados_solver_lat.h',
f'{gen}/acados_solver.pxd',
f'{gen}/lat_model/lat_expl_vde_adj.c',

@ -9,7 +9,7 @@ from selfdrive.controls.lib.drive_helpers import T_IDXS
if __name__ == '__main__': # generating code
from pyextra.acados_template import AcadosModel, AcadosOcp, AcadosOcpSolver
else:
from selfdrive.controls.lib.lateral_mpc_lib.c_generated_code.acados_ocp_solver_pyx import AcadosOcpSolverFast # pylint: disable=no-name-in-module
from selfdrive.controls.lib.lateral_mpc_lib.c_generated_code.acados_ocp_solver_pyx import AcadosOcpSolverFast # pylint: disable=no-name-in-module, import-error
LAT_MPC_DIR = os.path.dirname(os.path.abspath(__file__))
EXPORT_DIR = os.path.join(LAT_MPC_DIR, "c_generated_code")

@ -41,6 +41,7 @@ generated_files = [
f'{gen}/main_long.c',
f'{gen}/acados_solver_long.h',
f'{gen}/acados_solver.pxd',
f'{gen}/long_model/long_expl_vde_adj.c',

@ -11,7 +11,7 @@ from selfdrive.controls.lib.radar_helpers import _LEAD_ACCEL_TAU
if __name__ == '__main__': # generating code
from pyextra.acados_template import AcadosModel, AcadosOcp, AcadosOcpSolver
else:
from selfdrive.controls.lib.longitudinal_mpc_lib.c_generated_code.acados_ocp_solver_pyx import AcadosOcpSolverFast # pylint: disable=no-name-in-module
from selfdrive.controls.lib.longitudinal_mpc_lib.c_generated_code.acados_ocp_solver_pyx import AcadosOcpSolverFast # pylint: disable=no-name-in-module, import-error
from casadi import SX, vertcat

Loading…
Cancel
Save