diff --git a/modules/planning/open_space/trajectory_smoother/BUILD b/modules/planning/open_space/trajectory_smoother/BUILD index 44298e56ba16ef1678bd4c7f045f21e62e829363..5b45986008d4a7d29e630e1967f96000c1dcbd99 100644 --- a/modules/planning/open_space/trajectory_smoother/BUILD +++ b/modules/planning/open_space/trajectory_smoother/BUILD @@ -98,8 +98,7 @@ cc_library( hdrs = ["distance_approach_problem.h"], copts = PLANNING_FOPENMP, deps = [ - # TODO(xiaoxq): Disable CUDA in planning temporarily. - # ":distance_approach_ipopt_cuda_interface", + ":distance_approach_ipopt_cuda_interface", ":distance_approach_ipopt_fixed_dual_interface", ":distance_approach_ipopt_fixed_ts_interface", ":distance_approach_ipopt_interface", diff --git a/modules/planning/open_space/trajectory_smoother/distance_approach_problem.cc b/modules/planning/open_space/trajectory_smoother/distance_approach_problem.cc index f845a1fafdeb5843ec9ffd76e954fa97f3f901e0..d262d38347e4675c7ae4947db7807d79842e0b9e 100644 --- a/modules/planning/open_space/trajectory_smoother/distance_approach_problem.cc +++ b/modules/planning/open_space/trajectory_smoother/distance_approach_problem.cc @@ -63,14 +63,12 @@ bool DistanceApproachProblem::Solve( horizon, ts, ego, xWS, uWS, l_warm_up, n_warm_up, x0, xF, last_time_u, XYbounds, obstacles_edges_num, obstacles_num, obstacles_A, obstacles_b, planner_open_space_config_); - // TODO(xiaoxq): Disable CUDA in planning temporarily. - // } else if (planner_open_space_config_.distance_approach_config() - // .distance_approach_mode() == DISTANCE_APPROACH_IPOPT_CUDA) { - // ptop = new DistanceApproachIPOPTCUDAInterface( - // horizon, ts, ego, xWS, uWS, l_warm_up, n_warm_up, x0, xF, - // last_time_u, XYbounds, obstacles_edges_num, obstacles_num, - // obstacles_A, obstacles_b, planner_open_space_config_); - // } + } else if (planner_open_space_config_.distance_approach_config() + .distance_approach_mode() == DISTANCE_APPROACH_IPOPT_CUDA) { + ptop = new DistanceApproachIPOPTCUDAInterface( + horizon, ts, ego, xWS, uWS, l_warm_up, n_warm_up, x0, xF, last_time_u, + XYbounds, obstacles_edges_num, obstacles_num, obstacles_A, obstacles_b, + planner_open_space_config_); } else if (planner_open_space_config_.distance_approach_config() .distance_approach_mode() == DISTANCE_APPROACH_IPOPT_FIXED_DUAL) { diff --git a/modules/planning/open_space/trajectory_smoother/distance_approach_problem.h b/modules/planning/open_space/trajectory_smoother/distance_approach_problem.h index ff92819e54dfa1a328e77084cb7851648ce39f4b..48b9d75198664b0c29b0e4e2e6cee956bb7e9c03 100644 --- a/modules/planning/open_space/trajectory_smoother/distance_approach_problem.h +++ b/modules/planning/open_space/trajectory_smoother/distance_approach_problem.h @@ -22,18 +22,20 @@ #include -#include "Eigen/Dense" - #include #include +#include "Eigen/Dense" + +#include "modules/planning/proto/planning.pb.h" + #include "modules/planning/common/planning_gflags.h" +#include "modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_cuda_interface.h" #include "modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_fixed_dual_interface.h" #include "modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_fixed_ts_interface.h" #include "modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_interface.h" #include "modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_relax_end_interface.h" #include "modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_relax_end_slack_interface.h" -#include "modules/planning/proto/planning.pb.h" namespace apollo { namespace planning {