Skip to content

Commit ffd9069

Browse files
lyklinglykling
committed
fix: fix build issue of master merging
Change-Id: I16f7c6cee3bf744ab3a3de3ce2417f41f0c452b2 Signed-off-by: liangjinping <[email protected]>
1 parent 1a00d4f commit ffd9069

File tree

43 files changed

+601
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+601
-481
lines changed

‎docker/scripts/dev_start.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ FAST_MODE="no"
4545
GEOLOC=
4646
TIMEZONE_CN=(
4747
"Time zone: Asia/Shanghai (CST, +0800)"
48+
"+0800"
4849
)
4950

5051
USE_LOCAL_IMAGE=0
@@ -291,7 +292,8 @@ function check_target_arch() {
291292

292293
function check_timezone_cn() {
293294
# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
294-
time_zone=$(timedatectl | grep "Time zone" | xargs)
295+
# time_zone=$(timedatectl | grep "Time zone" | xargs)
296+
time_zone=$(date +"%z")
295297

296298
for tz in "${TIMEZONE_CN[@]}"; do
297299
if [[ "${time_zone}" == "${tz}" ]]; then
@@ -510,7 +512,7 @@ function main() {
510512
"Try \"sudo apt install python3-pip\" "
511513
else
512514
info "Installing python tools ..."
513-
install_python_tools
515+
# install_python_tools
514516

515517
info "Installing perception models ..."
516518
install_perception_models

‎modules/audio/BUILD‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
1-
load("//tools:apollo_package.bzl", "apollo_package", "apollo_cc_library", "apollo_cc_test", "apollo_component")
1+
load("//tools:apollo_package.bzl", "apollo_cc_library", "apollo_cc_test", "apollo_component", "apollo_package")
22
load("//tools:cpplint.bzl", "cpplint")
3+
load("//third_party/gpus:common.bzl", "gpu_library", "if_cuda", "if_rocm")
34

45
package(default_visibility = ["//visibility:public"])
56

67
apollo_cc_library(
78
name = "apollo_audio",
89
srcs = [
9-
"common/audio_gflags.cc",
10+
"common/audio_gflags.cc",
1011
"common/audio_info.cc",
1112
"common/message_process.cc",
1213
"inference/direction_detection.cc",
1314
"inference/moving_detection.cc",
14-
"inference/siren_detection.cc",
15+
"inference/siren_detection.cc",
1516
],
1617
hdrs = [
17-
"common/audio_gflags.h",
18+
"common/audio_gflags.h",
1819
"common/audio_info.h",
1920
"common/message_process.h",
2021
"inference/direction_detection.h",
2122
"inference/moving_detection.h",
22-
"inference/siren_detection.h",
23+
"inference/siren_detection.h",
2324
],
2425
deps = [
25-
"@fftw3",
26-
"@libtorch_gpu",
27-
"@eigen",
28-
"@com_github_jbeder_yaml_cpp//:yaml-cpp",
29-
"@com_github_gflags_gflags//:gflags",
3026
"//cyber",
3127
"//modules/common/math",
28+
"//modules/common_msgs/audio_msgs:audio_cc_proto",
29+
"//modules/common_msgs/basic_msgs:geometry_cc_proto",
3230
"//modules/drivers/microphone/proto:audio_cc_proto",
3331
"//modules/drivers/microphone/proto:microphone_config_cc_proto",
34-
"//modules/common_msgs/basic_msgs:geometry_cc_proto",
35-
"//modules/common_msgs/audio_msgs:audio_cc_proto",
36-
]
32+
"@com_github_gflags_gflags//:gflags",
33+
"@com_github_jbeder_yaml_cpp//:yaml-cpp",
34+
"@eigen",
35+
"@fftw3",
36+
] + if_cuda([
37+
"@libtorch_gpu_cuda",
38+
]) + if_rocm([
39+
"@libtorch_gpu_rocm",
40+
]),
3741
)
3842

3943
apollo_component(
@@ -44,12 +48,12 @@ apollo_component(
4448
"-DMODULE_NAME=\\\"audio\\\"",
4549
],
4650
deps = [
47-
"//cyber",
4851
":apollo_audio",
52+
"//cyber",
4953
"//modules/audio/proto:audio_conf_cc_proto",
54+
"//modules/common/util:util_tool",
5055
"//modules/common_msgs/basic_msgs:geometry_cc_proto",
5156
"//modules/common_msgs/localization_msgs:localization_cc_proto",
52-
"//modules/common/util:util_tool",
5357
],
5458
)
5559

‎modules/drivers/lidar/lslidar/BUILD‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1+
load("//tools:apollo_package.bzl", "apollo_cc_binary", "apollo_cc_library", "apollo_component", "apollo_package")
12
load("//tools/install:install.bzl", "install")
3+
load("//tools:cpplint.bzl", "cpplint")
24

35
package(default_visibility = ["//visibility:public"])
46

5-
install(
6-
name = "install",
7-
data_dest = "drivers/addition_data/lidar/lslidar",
8-
library_dest = "drivers/lib/lidar/lslidar",
9-
data = [
10-
":runtime_data",
11-
],
12-
targets = [
13-
"//modules/drivers/lidar/lslidar/driver:liblslidar_driver_component.so",
14-
"//modules/drivers/lidar/lslidar/parser:liblslidar_convert_component.so",
15-
],
16-
)
7+
# install(
8+
# name = "install",
9+
# data = [
10+
# ":runtime_data",
11+
# ],
12+
# data_dest = "drivers/addition_data/lidar/lslidar",
13+
# library_dest = "drivers/lib/lidar/lslidar",
14+
# targets = [
15+
# "//modules/drivers/lidar/lslidar/driver:liblslidar_driver_component.so",
16+
# "//modules/drivers/lidar/lslidar/parser:liblslidar_convert_component.so",
17+
# ],
18+
# )
1719

1820
filegroup(
1921
name = "runtime_data",
@@ -25,3 +27,7 @@ filegroup(
2527
"params/*.yaml",
2628
]),
2729
)
30+
31+
apollo_package()
32+
33+
cpplint()

‎modules/drivers/lidar/lslidar/driver/BUILD‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
1+
load("//tools:apollo_package.bzl", "apollo_cc_binary", "apollo_cc_library", "apollo_component", "apollo_package")
12
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
23
load("//tools:cpplint.bzl", "cpplint")
34
load("//tools/install:install.bzl", "install")
45

5-
66
package(default_visibility = ["//visibility:public"])
77

8+
# install(
9+
# name = "install",
10+
# library_dest = "drivers/lib/lidar/lslidar/driver",
11+
# targets = [
12+
# ":liblslidar_driver_component.so",
13+
# ],
14+
# )
815

9-
10-
install(
11-
name = "install",
12-
library_dest = "drivers/lib/lidar/lslidar/driver",
13-
targets = [
14-
":liblslidar_driver_component.so",
15-
],
16-
)
17-
18-
cc_binary(
16+
apollo_cc_binary(
1917
name = "liblslidar_driver_component.so",
2018
linkshared = True,
2119
linkstatic = True,
2220
deps = [":lslidar_driver_component_lib"],
2321
)
2422

25-
cc_library(
23+
apollo_cc_library(
2624
name = "lslidar_driver_component_lib",
2725
srcs = ["lslidar_driver_component.cc"],
2826
hdrs = ["lslidar_driver_component.h"],
@@ -32,10 +30,9 @@ cc_library(
3230
"//modules/common/util:util_tool",
3331
"//modules/drivers/lidar/lslidar/driver",
3432
],
35-
alwayslink = True,
3633
)
3734

38-
cc_library(
35+
apollo_cc_library(
3936
name = "driver",
4037
srcs = [
4138
"driver.cc",
@@ -47,7 +44,7 @@ cc_library(
4744
],
4845
copts = ['-DMODULE_NAME=\\"lslidar\\"'],
4946
linkopts = [
50-
"-lpcap",
47+
"-lpcap",
5148
],
5249
deps = [
5350
"//cyber",
@@ -56,4 +53,6 @@ cc_library(
5653
],
5754
)
5855

56+
apollo_package()
57+
5958
cpplint()

‎modules/drivers/lidar/lslidar/parser/BUILD‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,50 @@
11
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
22
load("//tools:cpplint.bzl", "cpplint")
33
load("//tools/install:install.bzl", "install")
4+
load("//tools:apollo_package.bzl", "apollo_cc_binary", "apollo_cc_library", "apollo_component", "apollo_package")
5+
load("//tools:cpplint.bzl", "cpplint")
46

57
package(default_visibility = ["//visibility:public"])
68

9+
# install(
10+
# name = "install",
11+
# library_dest = "drivers/lib/lidar/lslidar/parser",
12+
# targets = [
13+
# ":liblslidar_convert_component.so",
14+
# ],
15+
# )
716

8-
install(
9-
name = "install",
10-
library_dest = "drivers/lib/lidar/lslidar/parser",
11-
targets = [
12-
":liblslidar_convert_component.so",
13-
],
14-
)
15-
16-
cc_binary(
17+
apollo_component(
1718
name = "liblslidar_convert_component.so",
18-
linkshared = True,
19-
linkstatic = True,
20-
deps = [":lslidar_convert_component_lib"],
21-
)
22-
23-
cc_library(
24-
name = "lslidar_convert_component_lib",
2519
srcs = ["lslidar_convert_component.cc"],
2620
hdrs = ["lslidar_convert_component.h"],
2721
copts = ['-DMODULE_NAME=\\"lslidar\\"'],
2822
deps = [
23+
":convert",
2924
"//cyber",
30-
"//modules/drivers/lidar/lslidar/parser:convert",
3125
],
32-
alwayslink = True,
3326
)
3427

35-
cc_library(
28+
apollo_cc_library(
3629
name = "convert",
3730
srcs = [
38-
"calibration.cc",
39-
"convert.cc",
40-
"lslidar16_parser.cc",
41-
"lslidar32_parser.cc",
42-
"lslidarCXV4_parser.cc",
43-
"lslidarCH16_parser.cc",
44-
"lslidarCH32_parser.cc",
45-
"lslidarCH64_parser.cc",
46-
"lslidarCH64w_parser.cc",
47-
"lslidarCH120_parser.cc",
48-
"lslidarCH128_parser.cc",
49-
"lslidarCH128X1_parser.cc",
50-
"lslidarLS128S2_parser.cc",
51-
"lslidar_parser.cc",
31+
"calibration.cc",
32+
"convert.cc",
33+
"lslidar16_parser.cc",
34+
"lslidar32_parser.cc",
35+
"lslidarCH120_parser.cc",
36+
"lslidarCH128X1_parser.cc",
37+
"lslidarCH128_parser.cc",
38+
"lslidarCH16_parser.cc",
39+
"lslidarCH32_parser.cc",
40+
"lslidarCH64_parser.cc",
41+
"lslidarCH64w_parser.cc",
42+
"lslidarCXV4_parser.cc",
43+
"lslidarLS128S2_parser.cc",
44+
"lslidar_parser.cc",
5245
],
5346
hdrs = [
54-
"calibration.h",
47+
"calibration.h",
5548
"convert.h",
5649
"lslidar_parser.h",
5750
],
@@ -61,8 +54,10 @@ cc_library(
6154
"//modules/common_msgs/sensor_msgs:pointcloud_cc_proto",
6255
"//modules/drivers/lidar/lslidar/proto:config_cc_proto",
6356
"//modules/drivers/lidar/lslidar/proto:lslidar_cc_proto",
64-
"@com_github_jbeder_yaml_cpp//:yaml-cpp",
57+
"@com_github_jbeder_yaml_cpp//:yaml-cpp",
6558
],
6659
)
6760

61+
apollo_package()
62+
6863
cpplint()

‎modules/drivers/lidar/lslidar/proto/BUILD‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
## Auto generated by `proto_build_generator.py`
2-
load("@rules_proto//proto:defs.bzl", "proto_library")
2+
# load("@rules_proto//proto:defs.bzl", "proto_library")
3+
load("//tools/proto:proto.bzl", "proto_library")
34
load("@rules_cc//cc:defs.bzl", "cc_proto_library")
45
load("//tools:python_rules.bzl", "py_proto_library")
6+
load("//tools:apollo_package.bzl", "apollo_cc_library", "apollo_component", "apollo_package")
7+
load("//tools:cpplint.bzl", "cpplint")
58

69
package(default_visibility = ["//visibility:public"])
710

8-
cc_proto_library(
9-
name = "config_cc_proto",
10-
deps = [
11-
":config_proto",
12-
],
13-
)
11+
# cc_proto_library(
12+
# name = "config_cc_proto",
13+
# deps = [
14+
# ":config_proto",
15+
# ],
16+
# )
1417

1518
proto_library(
1619
name = "config_proto",
@@ -20,20 +23,20 @@ proto_library(
2023
],
2124
)
2225

23-
py_proto_library(
24-
name = "config_py_pb2",
25-
deps = [
26-
":config_proto",
27-
":lslidar_py_pb2",
28-
],
29-
)
26+
# py_proto_library(
27+
# name = "config_py_pb2",
28+
# deps = [
29+
# ":config_proto",
30+
# ":lslidar_py_pb2",
31+
# ],
32+
# )
3033

31-
cc_proto_library(
32-
name = "lslidar_cc_proto",
33-
deps = [
34-
":lslidar_proto",
35-
],
36-
)
34+
# cc_proto_library(
35+
# name = "lslidar_cc_proto",
36+
# deps = [
37+
# ":lslidar_proto",
38+
# ],
39+
# )
3740

3841
proto_library(
3942
name = "lslidar_proto",
@@ -43,10 +46,13 @@ proto_library(
4346
],
4447
)
4548

46-
py_proto_library(
47-
name = "lslidar_py_pb2",
48-
deps = [
49-
":lslidar_proto",
50-
"//modules/common_msgs/basic_msgs:header_py_pb2",
51-
],
52-
)
49+
# py_proto_library(
50+
# name = "lslidar_py_pb2",
51+
# deps = [
52+
# ":lslidar_proto",
53+
# "//modules/common_msgs/basic_msgs:header_py_pb2",
54+
# ],
55+
# )
56+
apollo_package()
57+
58+
cpplint()

0 commit comments

Comments
 (0)