提交 28bb8035 编写于 作者: C changsh726 提交者: Liu Jiaming

Planning: re-enable CUDA in open space planner

上级 f039bac5
...@@ -98,8 +98,7 @@ cc_library( ...@@ -98,8 +98,7 @@ cc_library(
hdrs = ["distance_approach_problem.h"], hdrs = ["distance_approach_problem.h"],
copts = PLANNING_FOPENMP, copts = PLANNING_FOPENMP,
deps = [ 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_dual_interface",
":distance_approach_ipopt_fixed_ts_interface", ":distance_approach_ipopt_fixed_ts_interface",
":distance_approach_ipopt_interface", ":distance_approach_ipopt_interface",
......
...@@ -63,14 +63,12 @@ bool DistanceApproachProblem::Solve( ...@@ -63,14 +63,12 @@ bool DistanceApproachProblem::Solve(
horizon, ts, ego, xWS, uWS, l_warm_up, n_warm_up, x0, xF, last_time_u, 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, XYbounds, obstacles_edges_num, obstacles_num, obstacles_A, obstacles_b,
planner_open_space_config_); planner_open_space_config_);
// TODO(xiaoxq): Disable CUDA in planning temporarily. } else if (planner_open_space_config_.distance_approach_config()
// } else if (planner_open_space_config_.distance_approach_config() .distance_approach_mode() == DISTANCE_APPROACH_IPOPT_CUDA) {
// .distance_approach_mode() == DISTANCE_APPROACH_IPOPT_CUDA) { ptop = new DistanceApproachIPOPTCUDAInterface(
// ptop = new DistanceApproachIPOPTCUDAInterface( horizon, ts, ego, xWS, uWS, l_warm_up, n_warm_up, x0, xF, last_time_u,
// horizon, ts, ego, xWS, uWS, l_warm_up, n_warm_up, x0, xF, XYbounds, obstacles_edges_num, obstacles_num, obstacles_A, obstacles_b,
// last_time_u, XYbounds, obstacles_edges_num, obstacles_num, planner_open_space_config_);
// obstacles_A, obstacles_b, planner_open_space_config_);
// }
} else if (planner_open_space_config_.distance_approach_config() } else if (planner_open_space_config_.distance_approach_config()
.distance_approach_mode() == .distance_approach_mode() ==
DISTANCE_APPROACH_IPOPT_FIXED_DUAL) { DISTANCE_APPROACH_IPOPT_FIXED_DUAL) {
......
...@@ -22,18 +22,20 @@ ...@@ -22,18 +22,20 @@
#include <vector> #include <vector>
#include "Eigen/Dense"
#include <coin/IpIpoptApplication.hpp> #include <coin/IpIpoptApplication.hpp>
#include <coin/IpSolveStatistics.hpp> #include <coin/IpSolveStatistics.hpp>
#include "Eigen/Dense"
#include "modules/planning/proto/planning.pb.h"
#include "modules/planning/common/planning_gflags.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_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_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_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_interface.h"
#include "modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_relax_end_slack_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 apollo {
namespace planning { namespace planning {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册