Skip to content

Commit ffa0765

Browse files
WildBeast114514WildBeast114514
committed
feat: release 9.0.0-beta
 - dreamview 2.0 release - bugs fix Change-Id: I5eab9d1149af7c2a09af8ef0d1884596d144f6dd
1 parent 5d98936 commit ffa0765

File tree

1,575 files changed

+288716
-188086
lines changed

Some content is hidden

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

1,575 files changed

+288716
-188086
lines changed

‎.bazelrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
try-import %workspace%/tools/bazel.rc
44
try-import %workspace%/.apollo.bazelrc
55

6+
try-import %workspace%/.custom.bazelrc
7+
68
# build --remote_cache="http://localhost:8080/

‎.buildtool.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[compile]
2+
march=-mavx2

‎BUILD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ install(
5656
"//third_party/camera_library:install",
5757
"//third_party/can_card_library:install",
5858
"//third_party/gpus:install",
59+
"//third_party/nvjpeg:install",
5960
"//third_party/localization_msf:install",
6061
"//third_party/ffmpeg:install",
6162
"//third_party/adv_plat:install",
@@ -101,6 +102,7 @@ install(
101102
"//third_party/uuid:install",
102103
"//third_party/yaml_cpp:install",
103104
"//third_party/qt5:install",
105+
"//third_party/nvjpeg:install",
104106
"//third_party/npp:install",
105107
"//third_party/gpus:install",
106108
"//third_party/localization_msf:install",
@@ -156,6 +158,7 @@ install_src_files(
156158
"//third_party/yaml_cpp:install_src",
157159
"//third_party/qt5:install_src",
158160
"//third_party/npp:install_src",
161+
"//third_party/nvjpeg:install_src",
159162
"//third_party/gpus:install_src",
160163
"//third_party/localization_msf:install_src",
161164
"//third_party/ffmpeg:install_src",
@@ -203,6 +206,7 @@ install_src_files(
203206
"//third_party/yaml_cpp:install_src",
204207
"//third_party/qt5:install_src",
205208
"//third_party/npp:install_src",
209+
"//third_party/nvjpeg:install_src",
206210
"//third_party/gpus:install_src",
207211
"//third_party/localization_msf:install_src",
208212
"//third_party/ffmpeg:install_src",

‎WORKSPACE‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#######################################APOLLO#######################################
12
workspace(name = "apollo")
23

34
load("//tools:workspace.bzl", "apollo_repositories")
@@ -99,4 +100,5 @@ grpc_deps()
99100

100101
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
101102

102-
grpc_extra_deps()
103+
grpc_extra_deps()
104+
#######################################APOLLO#######################################

‎WORKSPACE.source‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#######################################APOLLO#######################################
2+
workspace(name = "apollo")
3+
4+
load("//tools:workspace.bzl", "apollo_repositories")
5+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
6+
7+
http_archive(
8+
name = "rules_foreign_cc",
9+
sha256 = "6041f1374ff32ba711564374ad8e007aef77f71561a7ce784123b9b4b88614fc",
10+
strip_prefix = "rules_foreign_cc-0.8.0",
11+
urls = [
12+
"https://apollo-system.bj.bcebos.com/archive/6.0/rules_foreign_cc-0.8.0.tar.gz",
13+
"https://github.com/bazelbuild/rules_foreign_cc/archive/0.8.0.tar.gz",
14+
],
15+
)
16+
17+
load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
18+
19+
rules_foreign_cc_dependencies()
20+
21+
apollo_repositories()
22+
23+
http_archive(
24+
name = "rules_cc",
25+
urls = [
26+
"https://apollo-system.cdn.bcebos.com/archive/8.0/rules_cc-0.0.1.tar.gz",
27+
"https://github.com/bazelbuild/rules_cc/releases/download/0.0.1/rules_cc-0.0.1.tar.gz",
28+
],
29+
sha256 = "4dccbfd22c0def164c8f47458bd50e0c7148f3d92002cdb459c2a96a68498241",
30+
patches = ["//tools/package:rules_cc.patch"],
31+
)
32+
33+
http_archive(
34+
name = "bazel_skylib",
35+
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
36+
urls = [
37+
"https://apollo-system.cdn.bcebos.com/archive/6.0/bazel-skylib-1.0.3.tar.gz",
38+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
39+
],
40+
)
41+
42+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
43+
44+
bazel_skylib_workspace()
45+
46+
load("@bazel_skylib//lib:versions.bzl", "versions")
47+
48+
versions.check(minimum_bazel_version = "3.7.0")
49+
50+
http_archive(
51+
name = "rules_proto",
52+
sha256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
53+
strip_prefix = "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313",
54+
urls = [
55+
"https://apollo-system.cdn.bcebos.com/archive/6.0/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
56+
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
57+
],
58+
)
59+
60+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
61+
62+
rules_proto_dependencies()
63+
64+
rules_proto_toolchains()
65+
66+
http_archive(
67+
name = "rules_python",
68+
sha256 = "b6d46438523a3ec0f3cead544190ee13223a52f6a6765a29eae7b7cc24cc83a0",
69+
urls = [
70+
"https://apollo-system.cdn.bcebos.com/archive/6.0/rules_python-0.1.0.tar.gz",
71+
"https://github.com/bazelbuild/rules_python/releases/download/0.1.0/rules_python-0.1.0.tar.gz",
72+
],
73+
)
74+
75+
# load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
76+
# grpc
77+
http_archive(
78+
name = "com_github_grpc_grpc",
79+
sha256 = "2378b608557a4331c6a6a97f89a9257aee2f8e56a095ce6619eea62e288fcfbe",
80+
patches = ["//third_party/absl:grpc.patch"],
81+
strip_prefix = "grpc-1.30.0",
82+
urls = [
83+
"https://apollo-system.cdn.bcebos.com/archive/8.0/v1.30.0-apollo.tar.gz",
84+
],
85+
)
86+
http_archive(
87+
name = "zlib",
88+
build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
89+
sha256 = "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff",
90+
strip_prefix = "zlib-1.2.11",
91+
urls = [
92+
"https://apollo-system.cdn.bcebos.com/archive/6.0/zlib-v1.2.11.tar.gz",
93+
"https://github.com/madler/zlib/archive/v1.2.11.tar.gz",
94+
],
95+
)
96+
97+
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
98+
99+
grpc_deps()
100+
101+
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
102+
103+
grpc_extra_deps()
104+
#######################################APOLLO#######################################

‎apollo.doxygen‎

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -948,12 +948,26 @@ WARN_LOGFILE =
948948
# tools \
949949
# scripts
950950
INPUT = \
951+
docs/pages_order.dox \
951952
docs/MAINPAGE_cn.md \
952-
docs/installation_guide_cn.md \
953-
docs/essential_software_installation_guide_cn.md \
954-
docs/packages_cn.md \
955-
docs/packages_core_cn.md \
956-
docs/quick_start_cn.md \
953+
INPUT += \
954+
docs/installation_instructions/installation_guide_cn.md \
955+
docs/installation_instructions/essential_software_installation_guide_cn.md \
956+
docs/installation_instructions/quick_start_cn.md \
957+
docs/user_guidelines/user_guidelines_cn.md \
958+
docs/user_guidelines/tool_aem_cn.md \
959+
docs/user_guidelines/tool_buildtool_cn.md \
960+
docs/user_guidelines/architecture_overview_cn.md \
961+
docs/user_guidelines/modules \
962+
docs/user_guidelines/tools \
963+
docs/practices/practices_cn.md \
964+
docs/practices/perception \
965+
docs/practices/planning \
966+
docs/data_types/data_types_cn.md \
967+
docs/packages/packages_cn.md \
968+
docs/packages/packages_core_cn.md \
969+
docs/faqs/faqs_cn.md \
970+
docs/faqs/dreamview_plus \
957971
cyber/base \
958972
cyber/blocker \
959973
cyber/class_loader \
@@ -1116,27 +1130,27 @@ INPUT = \
11161130
modules/planning/traffic_rules/stop_sign \
11171131
modules/planning/traffic_rules/traffic_light \
11181132
modules/planning/traffic_rules/yield_sign \
1119-
modules/perception/camera_detection_2d/conf \
1120-
modules/perception/camera_detection_2d/dag \
1121-
modules/perception/camera_detection_2d/data \
1122-
modules/perception/camera_detection_2d/detector \
1123-
modules/perception/camera_detection_2d/proto \
1124-
modules/perception/camera_detection_2d/camera_detection_2d_component.h \
1125-
modules/perception/camera_detection_2d/camera_detection_2d_component.cc \
1126-
modules/perception/camera_detection_2d/README.md \
1127-
modules/perception/camera_detection_3d/conf \
1128-
modules/perception/camera_detection_3d/dag \
1129-
modules/perception/camera_detection_3d/data \
1130-
modules/perception/camera_detection_3d/detector \
1131-
modules/perception/camera_detection_3d/proto \
1132-
modules/perception/camera_detection_3d/camera_detection_3d_component.h \
1133-
modules/perception/camera_detection_3d/camera_detection_3d_component.cc \
1134-
modules/perception/camera_detection_3d/README.md \
1133+
modules/perception/camera_detection_multi_stage/conf \
1134+
modules/perception/camera_detection_multi_stage/dag \
1135+
modules/perception/camera_detection_multi_stage/data \
1136+
modules/perception/camera_detection_multi_stage/detector \
1137+
modules/perception/camera_detection_multi_stage/proto \
1138+
modules/perception/camera_detection_multi_stage/camera_detection_multi_stage_component.h \
1139+
modules/perception/camera_detection_multi_stage/camera_detection_multi_stage_component.cc \
1140+
modules/perception/camera_detection_multi_stage/README.md \
1141+
modules/perception/camera_detection_single_stage/conf \
1142+
modules/perception/camera_detection_single_stage/dag \
1143+
modules/perception/camera_detection_single_stage/data \
1144+
modules/perception/camera_detection_single_stage/detector \
1145+
modules/perception/camera_detection_single_stage/proto \
1146+
modules/perception/camera_detection_single_stage/camera_detection_single_stage_component.h \
1147+
modules/perception/camera_detection_single_stage/camera_detection_single_stage_component.cc \
1148+
modules/perception/camera_detection_single_stage/README.md \
11351149
modules/perception/common \
11361150
modules/perception/data \
11371151
modules/perception/launch/perception_all.launch \
1138-
modules/perception/launch/perception_camera_2d.launch \
1139-
modules/perception/launch/perception_camera_3d.launch \
1152+
modules/perception/launch/perception_camera_multi_stage.launch \
1153+
modules/perception/launch/perception_camera_single_stage.launch \
11401154
modules/perception/launch/perception_lane.launch \
11411155
modules/perception/launch/perception_lidar.launch \
11421156
modules/perception/launch/perception_radar.launch \
@@ -1202,20 +1216,18 @@ INPUT_FILE_ENCODING =
12021216
# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
12031217
# *.vhdl, *.ucf, *.qsf and *.ice.
12041218

1205-
FILE_PATTERNS = *.cc \
1206-
*.h \
1219+
FILE_PATTERNS = \
12071220
*.md \
1208-
*.pb.h \
1209-
*.pb.cc \
12101221
*.txt \
1211-
*.pb.txt \
12121222
*.dag \
12131223
*.launch \
12141224
*.yaml \
12151225
*.yml \
12161226
*.proto \
12171227
*.conf \
12181228
*.flag \
1229+
*.cc \
1230+
*.h \
12191231

12201232
# The RECURSIVE tag can be used to specify whether or not subdirectories should
12211233
# be searched for input files as well.
@@ -1247,7 +1259,7 @@ EXCLUDE_SYMLINKS = NO
12471259
# exclude all test directories for example use the pattern */test/*
12481260

12491261
EXCLUDE_PATTERNS = *_test.cc \
1250-
# */bazel-* \
1262+
*/bazel-* \
12511263
*/third_party/* \
12521264
*/modules/kernel/* \
12531265
*/modules/ros/* \
@@ -1317,7 +1329,7 @@ IMAGE_PATH =
13171329
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
13181330
# properly processed by doxygen.
13191331

1320-
INPUT_FILTER = "python docs/input_filter.py"
1332+
INPUT_FILTER = "python3 docs/input_filter.py"
13211333

13221334
# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
13231335
# basis. Doxygen will compare the file name with each pattern and apply the

‎apollo.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ function _usage() {
124124
${BLUE}build_cpu [module]${NO_COLOR}: build in CPU mode. Equivalent to 'bazel build --config=cpu'
125125
${BLUE}build_gpu [module]${NO_COLOR}: run build in GPU mode. Equivalent to 'bazel build --config=gpu'
126126
${BLUE}build_opt_gpu [module]${NO_COLOR}: optimized build in GPU mode. Equivalent to 'bazel build --config=opt --config=gpu'
127+
${BLUE}build_legacy [module]${NO_COLOR}: legacy way to build apollo
127128
${BLUE}test [module]${NO_COLOR}: run unittest for cyber (module='cyber') or modules/<module>. If unspecified, test all.
128129
${BLUE}coverage [module]${NO_COLOR}: run coverage test for cyber (module='cyber') or modules/<module>. If unspecified, coverage all.
129130
${BLUE}lint${NO_COLOR}: run code style check
@@ -158,6 +159,8 @@ function main() {
158159
apollo_env_setup
159160

160161
local build_sh="${APOLLO_ROOT_DIR}/scripts/apollo_build.sh"
162+
local build_legacy_sh="${APOLLO_ROOT_DIR}/scripts/apollo_build_legacy.sh"
163+
local pkg_sh="${APOLLO_ROOT_DIR}/scripts/apollo_build_package.sh"
161164
local test_sh="${APOLLO_ROOT_DIR}/scripts/apollo_test.sh"
162165
local coverage_sh="${APOLLO_ROOT_DIR}/scripts/apollo_coverage.sh"
163166
local ci_sh="${APOLLO_ROOT_DIR}/scripts/apollo_ci.sh"
@@ -171,6 +174,12 @@ function main() {
171174
build)
172175
env ${APOLLO_ENV} bash "${build_sh}" "$@"
173176
;;
177+
build_pkg*)
178+
info deprecated, please use \'build, build_opt, build_opt_gpu, build_dbg\' command instead
179+
;;
180+
build_legacy)
181+
env ${APOLLO_ENV} bash "${build_legacy_sh}" --config=opt --config=gpu "$@"
182+
;;
174183
build_opt)
175184
env ${APOLLO_ENV} bash "${build_sh}" --config=opt "$@"
176185
;;

‎ci.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Global:
2+
version: 2.0
3+
4+
Default:
5+
profile: [change]
6+
7+
Profiles:
8+
- profile:
9+
name: change
10+
mode: AGENT
11+
environment:
12+
cluster: DECK_CENTOS7U5_K3
13+
build:
14+
command: bash scripts/apollo_ci.sh build
15+
artifacts:
16+
release: true
17+
- profile:
18+
name: merge
19+
mode: AGENT
20+
environment:
21+
cluster: DECK_CENTOS7U5_K3
22+
build:
23+
command: bash scripts/apollo_ci.sh build
24+
artifacts:
25+
release: true

‎cyber/base/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ apollo_cc_test(
8686
],
8787
)
8888

89-
cc_test(
89+
apollo_cc_test(
9090
name = "unbounded_queue_test",
9191
size = "small",
9292
srcs = ["unbounded_queue_test.cc"],

‎cyber/class_loader/BUILD‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
21
load("//tools:cpplint.bzl", "cpplint")
32
load("//tools:apollo_package.bzl", "apollo_package", "apollo_cc_library", "apollo_cc_test")
43

@@ -22,21 +21,21 @@ apollo_cc_library(
2221
],
2322
)
2423

25-
apollo_cc_test(
26-
name = "class_loader_test",
27-
size = "small",
28-
srcs = ["class_loader_test.cc"],
29-
data = [
30-
"//cyber/class_loader/test:plugin1",
31-
"//cyber/class_loader/test:plugin2",
32-
],
33-
deps = [
34-
"//cyber",
35-
"//cyber/class_loader/test:base",
36-
"//cyber/proto:unit_test_cc_proto",
37-
"@com_google_googletest//:gtest",
38-
],
39-
)
24+
# apollo_cc_test(
25+
# name = "class_loader_test",
26+
# size = "small",
27+
# srcs = ["class_loader_test.cc"],
28+
# data = [
29+
# "//cyber/class_loader/test:plugin1",
30+
# "//cyber/class_loader/test:plugin2",
31+
# ],
32+
# deps = [
33+
# "//cyber",
34+
# "//cyber/class_loader/test:base",
35+
# "//cyber/proto:unit_test_cc_proto",
36+
# "@com_google_googletest//:gtest",
37+
# ],
38+
# )
4039

4140
apollo_package()
4241
cpplint()

0 commit comments

Comments
 (0)