Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
528b845a
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,发现更多精彩内容 >>
提交
528b845a
编写于
9月 07, 2020
作者:
S
storypku
提交者:
Liu Jiaming
9月 08, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Build: unified use for USE_ESD_CAN & WITH_TELEOP & USE_GPU
上级
2129310a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
28 addition
and
49 deletion
+28
-49
modules/dreamview/backend/BUILD
modules/dreamview/backend/BUILD
+3
-3
modules/dreamview/backend/teleop/BUILD
modules/dreamview/backend/teleop/BUILD
+12
-32
modules/monitor/hardware/esdcan_monitor.cc
modules/monitor/hardware/esdcan_monitor.cc
+2
-2
modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_cuda_interface.cc
...ectory_smoother/distance_approach_ipopt_cuda_interface.cc
+4
-4
tools/apollo.bazelrc.sample
tools/apollo.bazelrc.sample
+1
-1
tools/platform/BUILD
tools/platform/BUILD
+1
-2
tools/platform/build_defs.bzl
tools/platform/build_defs.bzl
+5
-5
未找到文件。
modules/dreamview/backend/BUILD
浏览文件 @
528b845a
load
(
"//tools:cpplint.bzl"
,
"cpplint"
)
load
(
"@rules_cc//cc:defs.bzl"
,
"cc_library"
)
load
(
"//tools/platform:build_defs.bzl"
,
"copts_if_
with_teleop"
,
"if_with
_teleop"
)
load
(
"//tools/platform:build_defs.bzl"
,
"copts_if_
teleop"
,
"if
_teleop"
)
package
(
default_visibility
=
[
"//visibility:public"
])
...
...
@@ -11,7 +11,7 @@ cc_library(
"main.cc"
,
],
hdrs
=
[
"dreamview.h"
],
copts
=
[
'-DMODULE_NAME=
\\
"dreamview
\\
"'
]
+
copts_if_
with_
teleop
(),
copts
=
[
'-DMODULE_NAME=
\\
"dreamview
\\
"'
]
+
copts_if_teleop
(),
deps
=
[
"//modules/common/configs:vehicle_config_helper"
,
"//modules/common/status"
,
...
...
@@ -30,7 +30,7 @@ cc_library(
"//modules/map/pnc_map"
,
"//modules/planning/proto:pad_msg_cc_proto"
,
"@civetweb//:civetweb++"
,
]
+
if_
with_
teleop
([
"//modules/dreamview/backend/teleop"
]),
]
+
if_teleop
([
"//modules/dreamview/backend/teleop"
]),
)
cpplint
()
modules/dreamview/backend/teleop/BUILD
浏览文件 @
528b845a
load
(
"@rules_cc//cc:defs.bzl"
,
"cc_library"
,
"cc_test"
)
load
(
"//tools:cpplint.bzl"
,
"cpplint"
)
load
(
"//tools/platform:build_defs.bzl"
,
"copts_if_
with
_teleop"
)
load
(
"//tools/platform:build_defs.bzl"
,
"copts_if_
teleop"
,
"if
_teleop"
)
package
(
default_visibility
=
[
"//visibility:public"
])
cc_library
(
name
=
"teleop"
,
srcs
=
select
({
"//tools/platform:with_teleop"
:
[
"teleop.cc"
,
],
"//conditions:default"
:
[
],
}),
hdrs
=
select
({
"//tools/platform:with_teleop"
:
[
"teleop.h"
,
],
"//conditions:default"
:
[
],
}),
copts
=
[
'-DMODULE_NAME=
\\
"dreamview
\\
"'
]
+
copts_if_with_teleop
(),
srcs
=
if_teleop
([
"teleop.cc"
]),
hdrs
=
if_teleop
([
"teleop.h"
]),
copts
=
[
'-DMODULE_NAME=
\\
"dreamview
\\
"'
]
+
copts_if_teleop
(),
deps
=
[
"//cyber"
,
"//modules/common/adapters:adapter_gflags"
,
...
...
@@ -32,27 +20,19 @@ cc_library(
"//modules/planning/proto:planning_cc_proto"
,
"//modules/planning/proto:pad_msg_cc_proto"
,
"@com_github_nlohmann_json//:json"
,
]
+
select
({
"//tools/platform:with_teleop"
:
[
"//modules/teleop/modem/proto:modem_info_cc_proto"
,
"//modules/teleop/daemon/proto:daemon_cmd_cc_proto"
,
"//modules/teleop/daemon/proto:daemon_rpt_cc_proto"
,
],
"//conditions:default"
:
[
],
}),
]
+
if_teleop
([
"//modules/teleop/modem/proto:modem_info_cc_proto"
,
"//modules/teleop/daemon/proto:daemon_cmd_cc_proto"
,
"//modules/teleop/daemon/proto:daemon_rpt_cc_proto"
,
]),
)
cc_test
(
name
=
"teleop_test"
,
size
=
"small"
,
srcs
=
select
({
"//tools/platform:with_teleop"
:
[
"teleop_test.cc"
,
],
"//conditions:default"
:
[
],
}),
srcs
=
if_teleop
(
[
"teleop_test.cc"
],
),
data
=
[
"//modules/dreamview/backend/testdata"
,
],
...
...
modules/monitor/hardware/esdcan_monitor.cc
浏览文件 @
528b845a
...
...
@@ -18,7 +18,7 @@
#include <string>
#if USE_ESD_CAN ==
true
#if USE_ESD_CAN ==
1
#include "esd_can/include/ntcan.h"
#endif
...
...
@@ -38,7 +38,7 @@ namespace apollo {
namespace
monitor
{
namespace
{
#if USE_ESD_CAN ==
true
#if USE_ESD_CAN ==
1
std
::
string
StatusString
(
const
NTCAN_RESULT
ntstatus
)
{
switch
(
ntstatus
)
{
case
NTCAN_SUCCESS
:
...
...
modules/planning/open_space/trajectory_smoother/distance_approach_ipopt_cuda_interface.cc
浏览文件 @
528b845a
...
...
@@ -22,7 +22,7 @@
#include <algorithm>
#include <limits>
#if
def USE_GPU
#if
USE_GPU == 1
#include "modules/planning/open_space/trajectory_smoother/planning_block.h"
#endif
...
...
@@ -2273,7 +2273,7 @@ bool DistanceApproachIPOPTCUDAInterface::eval_h(int n, const double* x,
if
(
values
==
nullptr
)
{
// return the structure. This is a symmetric matrix, fill the lower left
// triangle only.
#if
def USE_GPU
#if
USE_GPU == 1
fill_lower_left
(
iRow
,
jCol
,
rind_L
,
cind_L
,
nnz_L
);
#else
AFATAL
<<
"CUDA enabled without GPU!"
;
...
...
@@ -2283,7 +2283,7 @@ bool DistanceApproachIPOPTCUDAInterface::eval_h(int n, const double* x,
// triangle only
obj_lam
[
0
]
=
obj_factor
;
#if
def USE_GPU
#if
USE_GPU == 1
data_transfer
(
&
obj_lam
[
1
],
lambda
,
m
);
#else
AFATAL
<<
"CUDA enabled without GPU!"
;
...
...
@@ -2293,7 +2293,7 @@ bool DistanceApproachIPOPTCUDAInterface::eval_h(int n, const double* x,
sparse_hess
(
tag_L
,
n
,
1
,
const_cast
<
double
*>
(
x
),
&
nnz_L
,
&
rind_L
,
&
cind_L
,
&
hessval
,
options_L
);
#if
def USE_GPU
#if
USE_GPU == 1
if
(
!
data_transfer
(
values
,
hessval
,
nnz_L
))
{
for
(
int
idx
=
0
;
idx
<
nnz_L
;
idx
++
)
{
values
[
idx
]
=
hessval
[
idx
];
...
...
tools/apollo.bazelrc.sample
浏览文件 @
528b845a
...
...
@@ -29,4 +29,4 @@ build:cuda_clang --action_env TF_CUDA_CLANG=1
build:tensorrt --action_env TF_NEED_TENSORRT=1
build:nonccl --define=no_nccl_support=true
build:teleop --define=WITH_TELEOP=
1
build:teleop --define=WITH_TELEOP=
true
tools/platform/BUILD
浏览文件 @
528b845a
...
...
@@ -26,10 +26,9 @@ config_setting(
},
)
#TODO(infra): set to true
config_setting
(
name
=
"with_teleop"
,
define_values
=
{
"WITH_TELEOP"
:
"
1
"
,
"WITH_TELEOP"
:
"
true
"
,
},
)
tools/platform/build_defs.bzl
浏览文件 @
528b845a
...
...
@@ -9,17 +9,17 @@ def if_gpu(if_true, if_false = []):
"//conditions:default"
:
if_false
,
})
#
def copts_if_gpu():
#
return if_gpu(["-DUSE_GPU=1"], ["-DUSE_GPU=0"])
def
copts_if_gpu
():
return
if_gpu
([
"-DUSE_GPU=1"
],
[
"-DUSE_GPU=0"
])
def
if_
with_
teleop
(
if_true
,
if_false
=
[]):
def
if_teleop
(
if_true
,
if_false
=
[]):
return
select
({
"//tools/platform:with_teleop"
:
if_true
,
"//conditions:default"
:
if_false
,
})
def
copts_if_
with_
teleop
():
return
if_
with_teleop
([
"-DWITH_TELEOP=1
"
])
def
copts_if_teleop
():
return
if_
teleop
([
"-DWITH_TELEOP=1"
],
[
"-DWITH_TELEOP=0
"
])
def
if_x86_mode
(
if_true
,
if_false
=
[]):
return
select
({
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录