Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
28bb8035
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
28bb8035
编写于
9月 14, 2020
作者:
C
changsh726
提交者:
Liu Jiaming
9月 14, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Planning: re-enable CUDA in open space planner
上级
f039bac5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
13 deletion
+12
-13
modules/planning/open_space/trajectory_smoother/BUILD
modules/planning/open_space/trajectory_smoother/BUILD
+1
-2
modules/planning/open_space/trajectory_smoother/distance_approach_problem.cc
...en_space/trajectory_smoother/distance_approach_problem.cc
+6
-8
modules/planning/open_space/trajectory_smoother/distance_approach_problem.h
...pen_space/trajectory_smoother/distance_approach_problem.h
+5
-3
未找到文件。
modules/planning/open_space/trajectory_smoother/BUILD
浏览文件 @
28bb8035
...
@@ -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"
,
...
...
modules/planning/open_space/trajectory_smoother/distance_approach_problem.cc
浏览文件 @
28bb8035
...
@@ -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
)
{
...
...
modules/planning/open_space/trajectory_smoother/distance_approach_problem.h
浏览文件 @
28bb8035
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录