Skip to content

Commit 74d9ebd

Browse files
committed
feat: sync updates for 10.0
- cyber: - 446af0a merge: merge preview features - 3f8d63c fix: link aem executable error of container - 9a7135b3a1 feat: add cyber benchmark - 47211ad4bf fix: aem link issue - 515ef153b3 fix: performance test don't end when there is no frame rate limit - b825231831 feat: benchmark add bandwidth - 784b9e4cc1 fix: benchmark error - b249de8077 fix: error of benchmark parse latency - 999ad7d65f feat: update Fast DDS version to v2.14.3 - 945a77924f fix: cyber_py3 init error - 2891b46 fix: cyber python init error - a3ad5c0a7f fix: fix issue that lock operation is not idempotent in high-frequency case - 538e9773c4 fix: correct collection of memory usage - 85680c5093 fix: timestamp error - 3f49dc0179 fix: build error and communication failed when using ros foxy or galatic - 83ba04f fix: build error and communication failed when using ros foxy or galatic - eefebda fix: building error of odometry_parser - 0852c9e3fe 将Qos的Depth设置为合适的值,避免内存占用过多 - 3e1bc77bee fix: fix env/path incorrect issue for host runtime - 5126162508 fix: cyber_recorder transmit failed when using arena transmit - d5a06e7 fix: compiling failed on arm since missing dependency of bvar - 83fd00e8c3 fix: not installing python related runfiles - aec50e34b3 fix: PyArg_ParseTuple failed when compiled by gcc-11 on c++17 standard - 7af88bcdc7 fix: wrong APOLLO_DISTRIBUTION_HOME env args setting when running on pkg env - e66fe8519d fix: aem启动环境时创建log, bag, record等文件夹 - 7cacbfe989 fix: issue of rtk player/recorder - 86e852eb2d fix: adaptation of cyber python api to host deployment - 90a87352a5 feat(perception): add bevformer+occ model link - 80c0b2bbc0 feat: scripts execution in the source environment is based on buildtool - 93f5c8c08b fix: fix ros_bridge can not communicate with ros over fastdds - a25a12db2f add volume of log to prevent stopping dv failed - f75e8252ee fix: 解决ubuntu各版本cuda密钥问题 - cf1c0e90a3 fix: fix potential command injection problem - 78251dc382 fix: sample files are generated in PWD by default - 195518f091 fix: issue of dreamview url - 50a8a6a513 fix: ansible取消安装不需要的包 - 8916e722d8 feat: 新增x86_64架构下ubuntu18 20 22 镜像构建dockerfile - 8a1e7370d1 bugfix(cyber): 修复cyber_recoder可能出现的发送消息失败错误 - 964fed3aa3 fix: install missing deps for aem - e19e4a9abd fix: fix build issue on host env - a9d7b671c9 chore: align cudnn and nvinfer version - 24313de5cd chore: change hardcode /apollo path to relative path - docs: - 7129be2d27 docs: update tools activation manual - cd8e8a2b11 docs: update activation manual for calibration tool - d9295c28e5 docs: update dev guide of planning - ff3a57da5e docs: update docs - 90a829f6d2 docs: update docs - c6b4489b29 docs: add docs for new feature of version 10.0 - 14565f2cd5 docs: 增加故障排查相关FAQ文档 - 5fa931e63e doc: fix expressions in English documents - 40a79f6e0f docs: update the gpu support section of installation guide - a49c2d2432 doc: add troubleshooting after upgrading to 10.0 - 030af6fb97 doc: 故障排查中区分9.0和10.0的apollo - 93eadef429 docs: update apollo 10.0 architecture diagram and fix docs page structure - 1ebf9e89a0 docs: add missing video links - canbus: - f7cd3bb640 chore: change path to relative path for all config files - 24313de5cd chore: change hardcode /apollo path to relative path - control: - f7cd3bb640 chore: change path to relative path for all config files - 24313de5cd chore: change hardcode /apollo path to relative path - dreamview: - c21f15ef44 feat: 增加currentTarget展示 - 5f67ff5433 feat: 增加地图排序 - 52d842f269 feat(dvp): curb point cloud - f731954520 feat(dv): add perception edge visualization - b9eeb3ec8d fix(dvp): curb point cloud style - 4e6e97fb10 fix(dvp):Indexeddb downgrade exception - 295753db77 feat: panel布局存储至后端 - cfa2b4e79a feat: 升级lang/ui/theme版本号 - d6f7d364c0 feat: 增加导出布局功能 - 2ccd2cc3fb feat: 格式化导出布局内容 - 504eca2d35 feat(dv): add dv layout from frontend to backend logic - 47d888031e feat: 升级dreamview-theme - 0684f10c8f feat: 增加dreamview-theme/dreamview-lang模块共享 - ba2e389541 f - 813238ce5c feat: 面板插件加载方式变更 - e7ee8576e4 feat: 面板插件加载方式变更 - f1c219fa86 feat(dv): Decoupling front-end panel json - f7cd3bb640 chore: change path to relative path for all config files - 8705317d07 feat: hmi状态更新错误的问题处理 - 21cdb96bd6 fix(dv): remove dis check of cycle routing - dbc05dfd52 feat: 去掉循环路由是否成环的检查逻辑 - 8bc66b86b9 feat: 共享websocketmanager实例 - 373a3868f3 feat(dv): add new map element of barrier gate and area - 820c82287e feat: DV新增道闸和区域的三维可视化展示 - fbc24f912b Fix(dreamview_plus): modules/dreamview、modules/dreamview_plus任意文件删除 添加获取环境变量是否成功的校验,同时添加对文件路径是否含/ .. 的校验避免路径穿越的安全问题 - 7352324cee Fix(dreamview_plus): modules/dreamview、modules/dreamview_plus任意文件删除 添加获取环境变量是否成功的校验,同时添加对文件路径是否含/ .. 的校验避免路径穿越的安全问题,修复格式问题 - 2f0398f543 Fix(dreamview\dreamview_plus):Shorten the timeout period and reduce the number of retries to prevent users from waiting too long. - 24313de5cd chore: change hardcode /apollo path to relative path - e2fd12798b fix(dv): global_common adapt to dv common - e45eaa8470 fix: fix proto not for issue of relative path - drivers: - 446af0a merge: merge preview features - a1b7c77 fix: remove object pool of lidar compensator for using arena - 1b588cd4e9 fix: remove object pool of lidar compensator - 20a185ad70 fix: remove object pool of lidar drivers - f7cd3bb640 chore: change path to relative path for all config files - 96e9c5ba02 apollo/modules/drivers 释放内存不当 - 2ac412c feat: add forsense gnss device (#15492) - 24313de5cd chore: change hardcode /apollo path to relative path - planning: - f7cd3bb640 chore: change path to relative path for all config files - 24313de5cd chore: change hardcode /apollo path to relative path - localization: - 999ad7d65f feat: update Fast DDS version to v2.14.3 - f7cd3bb640 chore: change path to relative path for all config files - a25a12db2f add volume of log to prevent stopping dv failed - 24313de5cd chore: change hardcode /apollo path to relative path - perception: - 4cf63cd814 add(map): perception barrier gate interface - f7cd3bb640 chore: change path to relative path for all config files - eae1ea4864 feat(perception): add bevformer plugins, image gpu-based resize, undistortion model. - 62a3813770 feat(perception): add bevformer+occ camera detection algorithm. - e9d75bd98f feat(perception): add bevformer plugins, image gpu-based resize, undistortion model. - 5546fd2f00 feat(perception): add bevformer+occ camera detection model. - 76cf407cfe feat(perception): add bevformer+occ camera detection model. - 24313de5cd chore: change hardcode /apollo path to relative path - prediction: - d319b1823a feat(prediction):Modify the proto of the prediction module to fit garbage detection. - f7cd3bb640 chore: change path to relative path for all config files - 24313de5cd chore: change hardcode /apollo path to relative path Change-Id: Ief2e94b0ead42197571d9863b6fc9325c6eedaaa Signed-off-by: liangjinping <[email protected]>
1 parent 80708ad commit 74d9ebd

File tree

942 files changed

+149643
-5663
lines changed

Some content is hidden

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

942 files changed

+149643
-5663
lines changed

.teamcity/coverage_diff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#!/usr/bin/env python
2+
#!/usr/bin/env python3
33
# -*- coding: utf-8 -*-
44

55
# Copyright (c) 2021 Apollo Authors. All Rights Reserved.

.teamcity/coverage_lines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
# Copyright (c) 2021 Apollo Authors. All Rights Reserved.

.teamcity/pull_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
# Copyright (c) 2021 Apollo Authors. All Rights Reserved.

BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ install(
2626
"//third_party/gtest:install",
2727
"//third_party/ipopt:install",
2828
"//third_party/libtorch:install",
29-
"//third_party/fastrtps:install",
29+
"//third_party/fastdds:install",
3030
"//third_party/gflags:install",
3131
"//third_party/glog:install",
3232
"//third_party/nlohmann_json:install",
@@ -74,7 +74,7 @@ install(
7474
"//third_party/gtest:install",
7575
"//third_party/ipopt:install",
7676
"//third_party/libtorch:install",
77-
"//third_party/fastrtps:install",
77+
"//third_party/fastdds:install",
7878
"//third_party/gflags:install",
7979
"//third_party/glog:install",
8080
"//third_party/nlohmann_json:install",
@@ -133,7 +133,7 @@ install_src_files(
133133
"//third_party/gtest:install_src",
134134
"//third_party/ipopt:install_src",
135135
"//third_party/libtorch:install_src",
136-
"//third_party/fastrtps:install_src",
136+
"//third_party/fastdds:install_src",
137137
"//third_party/gflags:install_src",
138138
"//third_party/glog:install_src",
139139
"//third_party/nlohmann_json:install_src",
@@ -181,7 +181,7 @@ install_src_files(
181181
"//third_party/centerpoint_infer_op:install_src",
182182
"//third_party/ipopt:install_src",
183183
"//third_party/libtorch:install_src",
184-
"//third_party/fastrtps:install_src",
184+
"//third_party/fastdds:install_src",
185185
"//third_party/gflags:install_src",
186186
"//third_party/glog:install_src",
187187
"//third_party/nlohmann_json:install_src",

README.md

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,30 @@ Apollo is loaded with new modules and features but needs to be calibrated and co
3535

3636
## Prerequisites
3737

38-
**[New 2021-01]** The Apollo platform (stable version) is now upgraded with
38+
**[New 2024-11]** The Apollo platform (stable version) is now upgraded with
3939
software packages and library dependencies of newer versions including:
4040

41-
1. CUDA upgraded to version 11.1 to support Nvidia Ampere (30x0 series) GPUs,
42-
with NVIDIA driver >= 455.32
43-
2. LibTorch (both CPU and GPU version) bumped to version 1.7.0 accordingly.
41+
1. CUDA upgraded to version 11.8 to support Nvidia Ada Lovelace (40x0 series) GPUs,
42+
with NVIDIA driver >= 520.61.05
43+
2. LibTorch (only for arm64, both CPU and GPU version) bumped to version 1.11.0 accordingly, and for x86_64, still version 1.7.0.
4444

4545
We do not expect a disruption to your current work, but to ease your life of
4646
migration, you would need to:
4747

48-
1. Update NVIDIA driver on your host to version >= 455.32.
48+
1. Update NVIDIA driver on your host to version >= 510.61.05.
4949
([Web link](https://www.nvidia.com/Download/index.aspx?lang=en-us))
5050
2. Pull latest code and run the following commands after restarting and
5151
logging into Apollo Development container:
5252

5353
```bash
5454
# Remove Bazel output of previous builds
5555
rm -rf /apollo/.cache/{bazel,build,repos}
56-
# Re-configure bazelrc.
57-
./apollo.sh config --noninteractive
56+
```
57+
58+
3. Restart dev container
59+
60+
```bash
61+
./docker/scripts/dev_start.sh
5862
```
5963

6064
---
@@ -65,9 +69,9 @@ rm -rf /apollo/.cache/{bazel,build,repos}
6569

6670
- NVIDIA Turing GPU / AMD GFX9/RDNA/CDNA GPU is strongly recommended
6771

68-
- Ubuntu 18.04
72+
- Ubuntu 18.04, 20.04, 22.04 are supported
6973

70-
- NVIDIA driver version 455.32.00 and above ([Web link](https://www.nvidia.com/Download/index.aspx?lang=en-us)) or [ROCm v5.1](https://docs.amd.com/bundle/ROCm-Installation-Guide-v5.1/page/Prerequisite_Actions.html) and above.
74+
- NVIDIA driver version 520.61.05 and above ([Web link](https://www.nvidia.com/Download/index.aspx?lang=en-us)) or [ROCm v5.1](https://docs.amd.com/bundle/ROCm-Installation-Guide-v5.1/page/Prerequisite_Actions.html) and above.
7175

7276
- Docker-CE version 19.03 and above ([Official doc](https://docs.docker.com/engine/install/ubuntu/))
7377

@@ -160,6 +164,12 @@ Apollo Open Source Platform 9.0 further focuses on enhancing the development and
160164

161165
![](docs/02_Quick%20Start/demo_guide/images/Apollo_9_0.png)
162166

167+
[**Apollo 10.0:**](http://172.20.102.14:8802/docs/apollo/latest/md_docs_2_xE5_x8F_x91_xE7_x89_x88_xE8_xAF_xB4_xE6_x98_x8E_2_xE6_x96_xB0_xE7_x89_x88_xE8_xAF_xB4_xE6_x98_x8E.html)
168+
169+
In Apollo 8.0, the concept of package management tailored for user learning scenarios was introduced to enable users to deploy and use Apollo more conveniently and efficiently. In Apollo 9.0, the package management tool was updated to Version 2.0, making it easier for users to conduct secondary development and effortlessly build their own autonomous driving applications based on Apollo. In Apollo 10.0, we realize that autonomous driving cannot remain at the stage of local validation. Instead, it requires a comprehensive upgrade, and needs to be applied to scenarios on a large scale. In terms of performance, the performance and stability of various layers and modules are optimied, and extensive tools are provided to improve optimization efficiency. At the cost level, the hardware costs are recuded by enriching the hardware ecosystem which provides users with more options. Besides, the software development costs are lowered by upgrading the operating system, establishing communication with other frameworks, and reusing ecological software capabilities. Regarding safety, functional safety strategies and functional safety framework capabilities are reinforced. See [Release Notes](./RELEASE.md) for more details.
170+
171+
![](docs/02_Quick%20Start/demo_guide/images/Apollo_10_0.png)
172+
163173
## Architecture
164174

165175
- **Hardware/ Vehicle Overview**
@@ -183,7 +193,9 @@ Congratulations! You have successfully built out Apollo without Hardware. If you
183193

184194
## Quick Starts:
185195

186-
- [Apollo 9.0 QuickStart Guide](https://apollo.baidu.com/docs/apollo/9.0/md_docs_2_xE5_xAE_x89_xE8_xA3_x85_xE6_x8C_x87_xE5_x8D_x97_2_xE5_x8C_x85_xE7_xAE_xA1_xE7_x90_x86_410bb1324792103828eeacd86377c551.html)
196+
- [Apollo 10.0 QuickStart Guide](https://apollo.baidu.com/docs/apollo/10.x/md_docs_2_xE5_xAE_x89_xE8_xA3_x85_xE6_x8C_x87_xE5_x8D_x97_2_xE5_x8C_x85_xE7_xAE_xA1_xE7_x90_x86_410bb1324792103828eeacd86377c551.html)
197+
198+
- [Apollo 9.0 QuickStart Guide](https://apollo.baidu.com/docs/apollo/9.x/md_docs_2_xE5_xAE_x89_xE8_xA3_x85_xE6_x8C_x87_xE5_x8D_x97_2_xE5_x8C_x85_xE7_xAE_xA1_xE7_x90_x86_410bb1324792103828eeacd86377c551.html)
187199

188200
- [Apollo 8.0 QuickStart Guide](docs/02_Quick%20Start/apollo_8_0_quick_start.md)
189201

RELEASE.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
# Release 10.0
2+
3+
In Apollo 8.0, the concept of package management tailored for user learning scenarios was introduced to enable users to deploy and use Apollo more conveniently and efficiently. In Apollo 9.0, the package management tool was updated to Version 2.0, making it easier for users to conduct secondary development and effortlessly build their own autonomous driving applications based on Apollo. In Apollo 10.0, we realize that autonomous driving cannot remain at the stage of local validation. Instead, it requires a comprehensive upgrade, and needs to be applied to scenarios on a large scale. In terms of performance, the performance and stability of various layers and modules are optimied, and extensive tools are provided to improve optimization efficiency. At the cost level, the hardware costs are recuded by enriching the hardware ecosystem which provides users with more options. Besides, the software development costs are lowered by upgrading the operating system, establishing communication with other frameworks, and reusing ecological software capabilities. Regarding safety, functional safety strategies and functional safety framework capabilities are reinforced.
4+
5+
## Major New Features and Improvements:
6+
7+
Better performance and enhanced stability to comprehensively reinforce Apollo's autonomous driving capabilities
8+
9+
- CyberRT Framework Upgrade: With industry-leading framework capabilities, low latency and low consumption, the performance is improved by 10 times, and the communication is more reliable. Apollo 10.0 features zero-copy communication, which ensures high performance and low consumption and achieves microsecond-level transmission latency. During inter-process communication, message are read and written directly on shared memory, avoiding memory copying, serialization, deserialization, and other resource-intensive operations. See [CyberRT Performance Report](docs/%E9%99%84%E5%BD%95/CyberRT%20Performance%20Report.md) for more details.
10+
- Comprehensive and Detailed Performance Analysis Tool: It empowers developers to create high-quality autonomous driving system applications. Five key resources including CPU, GPU, memory, graphics memory, and IO are comprehensively monitored and tracked in real time with a visual interface to identify issues immediately. Function-level analysis capabilities ensure precise localization. Intuitively analysis of resource consumption distribution at the function-level granularity helps developers conduct in-depth optimizations to improve performance. See [Cyber RT Performance Analysis Tool](docs/%E6%A1%86%E6%9E%B6%E8%AE%BE%E8%AE%A1/%E8%BD%AF%E4%BB%B6%E6%A0%B8%E5%BF%83/CyberRT/Cyber%20RT%20Performance%20Analysis%20Tool.md) for more details.
11+
12+
Stronger capabilities, More various ecological support to significantly reduce R&D costs for both software and hardware
13+
14+
- Pure Vision Perception Solution with Low Cost and High Ceiling: The mainstream perception paradigms of visual BEV (Bird's Eye View) object detection and occupancy network are introduced into the Apollo open-source framework, and optimizations are performed based on industry-standard models, with each paradigm surpassing the industry-standard models in performance. Deployment is also extensively optimized, and now the inference frame rate can reach 5Hz on a single Orin platform. See [The Introduction and tutorials of vision object detection and occpancy prediction model](docs/%E5%BA%94%E7%94%A8%E5%AE%9E%E8%B7%B5/%E5%BC%80%E5%8F%91%E8%B0%83%E8%AF%95%E6%95%99%E7%A8%8B/Apollo%E6%84%9F%E7%9F%A5%E5%AE%9E%E8%B7%B5/%E6%84%9F%E7%9F%A5%E6%A8%A1%E5%9E%8B%E9%83%A8%E7%BD%B2%E8%AE%AD%E7%BB%83/The_introduction_and_tutorials_of_vision_obejct_detection_and_occpancy_prediction_model.md) for more details.
15+
- Various Software Ecosystem and Accelerated Iteration Efficiency to Reduce Software Development and Deployment Costs: By integrating with the ROS ecosystem at the framework level, software reuse costs are lowered, R&D efficiency is enhanced, and more use scenarios are catered. The plugin engineering design simplifies expansion. Meanwhile, typical universal modules are ready to use at zero cost, while modules with customized capabilities can be integrated at low cost through conversion. Besides, it is more convenient and efficient to directly install and deploy multiple system versions on physical machines. Also, the deployment tool offers one-click packaging, enabling batch deployment of secondary development components. See [Cyber RT Communication with ROS](docs/%E6%A1%86%E6%9E%B6%E8%AE%BE%E8%AE%A1/%E8%BD%AF%E4%BB%B6%E6%A0%B8%E5%BF%83/CyberRT/Cyber%20RT%20Communication%20with%20ROS.md) and [Installation Guide](docs/%E5%AE%89%E8%A3%85%E6%8C%87%E5%8D%97/Installation%20Guide.md) for more details.
16+
- Broader Hardware Ecosystem Support Offering More Options and More Suitable Scenarios to Reduce Hardware Selection Costs: An industry-leading hardware ecosystem is built through collaborations with over 32 manufacturers, supporting more than 73 devices and adding over 20 new models in our list. Particularly, the number of core devices (such as domain controllers, LiDARs, and inertial navigation systems) has doubled or tripled. We also provide a new hardware adaptation guide. All these provide a more convenient access mechanism for hardware ecosystem partners to connect with a broader market, fostering a collaborative ecosystem model.
17+
18+
Comprehensive Safety Coverage for More Stable and Reliable Autonomous Driving
19+
20+
- Compliance with Industry Safety Standards for Autonomous Driving: Functional safety software modules are designed and implemented based on relevant standards and specifications in ISO 26262 Road vehicles – Functional safety and ISO 21448 Road vehicles – Safety of the intended functionality.
21+
- Comprehensive Functional Safety Strategies: These include hardware safety monitoring of sensors, computing units, chassis, vehicles, and other related components; full-link anomaly monitoring of sensor input to perception, prediction, planning, control, and chassis communication modules; runtime dependency environment anomaly monitoring, including system anomalies, resource occupancy, network, and IO; and independent capabilities for detecting collisions, traffic rule violations, and accidents.
22+
- Robust Functional Safety Framework: With various detection items and easy expandability, the framework offers access standards for users to customize detection items at low cost. Besides, it is highly real-time, taking less than 1ms from anomaly detection to MRC (Minimum Risk Condition) strategy implementation. Meanwhile, it boasts diverse MRC strategy capabilities, with built-in configurations such as warnings, gentle braking, and emergency braking, and suopports custom development.
23+
124
# Release 9.0
225

326
Apollo Open Source Platform 9.0 further focuses on enhancing the development and debugging experience, dedicated to provide autonomous driving developers with a unified development tool platform and easy-to-extend PnC and perception software framework interfaces. The new version reshapes the PnC and perception extension development method based on package management. It optimizes component splitting and configuration management according to business logic, simplifying the process of calling. In addition to the component extension method, a more lightweight plugin extension method has been added, simplifying the process of extending. The new version introduces Dreamview Plus, a brand-new developer tool that introduces modes for convenient multi-scenario use, a panel layout customizing visualization, and a resource center providing richer development resources. Furthermore, the LiDAR and Camera detection models in the new version have been upgraded for improved results, and incremental training methods have been opened up for easy extension. At the same time, support for 4D millimeter-wave radar has been added. Finally, the new version is adapted to the ARM architecture, and supports compilation and running on Orin, providing developers with additional device options.

aem/activate.sh

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,12 @@ function pathappend() {
6262
}
6363

6464
function generate_ld_library_path() {
65-
cat ${APOLLO_ENV_ROOT}/etc/ld.so.conf.d/apollo.conf |
66-
grep -v -E '^\s*$' |
67-
grep -v -E '^\s*#.*$' |
68-
tr '\n' ':'
65+
if [[ -e "${APOLLO_ENV_ROOT}/etc/ld.so.conf.d/apollo.conf" ]]; then
66+
cat ${APOLLO_ENV_ROOT}/etc/ld.so.conf.d/apollo.conf |
67+
grep -v -E '^\s*$' |
68+
grep -v -E '^\s*#.*$' |
69+
tr '\n' ':'
70+
fi
6971
}
7072

7173
deactivate() {
@@ -99,11 +101,11 @@ restore_env() {
99101

100102
deactivate
101103

102-
# export APOLLO_ENV_WORKROOT="${APOLLO_ENV_ROOT}"
104+
export APOLLO_ENV_WORKROOT="${APOLLO_ENV_WORKSPACE}"
103105

104106
# paths
105107
export APOLLO_MODEL_PATH="${APOLLO_ENV_ROOT}/apollo/modules/perception/data/models"
106-
export APOLLO_LIB_PATH="${APOLLO_ENV_ROOT}/lib"
108+
export APOLLO_LIB_PATH="${APOLLO_ENV_ROOT}/opt/apollo/neo/lib"
107109
export APOLLO_DAG_PATH="${APOLLO_ENV_ROOT}/apollo"
108110
export APOLLO_FLAG_PATH="${APOLLO_ENV_ROOT}/apollo"
109111
export APOLLO_CONF_PATH="${APOLLO_ENV_ROOT}/apollo"
@@ -112,10 +114,11 @@ export APOLLO_RUNTIME_PATH="${APOLLO_ENV_ROOT}/apollo"
112114
# TODO: set `/apollo/apollo/neo` as prefix
113115
export APOLLO_PLUGIN_INDEX_PATH="${APOLLO_ENV_ROOT}/opt/apollo/neo/share/cyber_plugin_index"
114116
export APOLLO_PLUGIN_LIB_PATH="${APOLLO_ENV_ROOT}/opt/apollo/neo/lib"
115-
export APOLLO_PLUGIN_DESCRIPTION_PATH="${APOLLO_ENV_ROOT}/opt/apollo/neo/share"
117+
export APOLLO_PLUGIN_DESCRIPTION_PATH="${APOLLO_ENV_ROOT}/opt/apollo/neo"
116118

117119
# runtime variables
118120
export AEM_HOST_VIRTUALENV=1
121+
export APOLLO_DISTRIBUTION_VERSION="${APOLLO_DISTRIBUTION_VERSION:-9.0}"
119122
export APOLLO_DISTRIBUTION_HOME="${APOLLO_DISTRIBUTION_HOME:-${APOLLO_ENV_ROOT}/opt/apollo/neo}"
120123
export APOLLO_SYSROOT_DIR="${APOLLO_SYSROOT_DIR:-/opt/apollo/sysroot}"
121124
export APOLLO_CACHE_DIR="${APOLLO_CACHE_DIR:-./.cache}"
@@ -130,14 +133,17 @@ export APOLLO_CONFIG_HOME="${APOLLO_CONFIG_HOME:-${HOME}/.apollo}"
130133

131134
# TODO: detect automatically
132135
backup_env TENSORRT_VERSION
133-
export TENSORRT_VERSION=7.2.1
136+
export TENSORRT_VERSION=8.6.1.6
137+
backup_env CUDNN_VERSION
138+
export CUDNN_VERSION=8.9.7.29
134139

135140
backup_env LD_LIBRARY_PATH
136141
# pathprepend "${APOLLO_LIB_PATH}" LD_LIBRARY_PATH
137142
# pathprepend "${APOLLO_PLUGIN_LIB_PATH}" LD_LIBRARY_PATH
138143
# # TODO: move to APOLLO_ENV_ROOT
139144
# pathprepend "/usr/local/fast-rtps/lib" LD_LIBRARY_PATH
140145
# pathprepend "/usr/local/libtorch_gpu/lib" LD_LIBRARY_PATH
146+
export LD_LIBRARY_PATH="$(generate_ld_library_path)"
141147

142148
backup_env PYTHONPATH
143149
pathprepend "${APOLLO_ENV_ROOT}/opt/apollo/neo/python" PYTHONPATH
@@ -151,6 +157,7 @@ PS1="\[\e[31m\][\[\e[m\]\[\e[32m\]\u\[\e[m\]\[\e[33m\]@\[\e[m\]\[\e[35m\]\h\[\e[
151157

152158
alias ls='ls --color=auto'
153159
alias buildtool='_abt() {
160+
export LD_LIBRARY_PATH="$(generate_ld_library_path)"
154161
command buildtool "$@"
155162
export LD_LIBRARY_PATH="$(generate_ld_library_path)"
156163
};_abt'
@@ -161,3 +168,4 @@ mkdir -p "${CYBER_PATH}"
161168
mkdir -p "${APOLLO_ENV_ROOT}/apollo/data/log"
162169
mkdir -p "${APOLLO_ENV_ROOT}/apollo/data/core"
163170
mkdir -p "${APOLLO_ENV_ROOT}/apollo/data/bag"
171+
mkdir -p "${APOLLO_ENV_ROOT}/apollo/modules/map/data"

aem/aem-bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#set -x
2222

2323
# global variables
24-
DV_URL="http://localhost1"
24+
DV_URL="http://localhost"
2525
DV_ORIG_PORT=8899
2626
DV_PLUS_PORT=8888
2727

aem/aem-create

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ parse_arguments() {
125125
;;
126126
-b | --backend)
127127
export APOLLO_ENV_BACKEND="$1"
128+
if [[ "${APOLLO_ENV_BACKEND}" == "host" ]]; then
129+
export APOLLO_ENV_WORKROOT="${APOLLO_ENV_WORKSPACE}"
130+
fi
128131
shift
129132
;;
130133
-c | --cross-platform)
@@ -170,6 +173,9 @@ parse_arguments() {
170173
;;
171174
-w | --workspace)
172175
export APOLLO_ENV_WORKSPACE="$1"
176+
if [[ "${APOLLO_ENV_BACKEND}" == "host" ]]; then
177+
export APOLLO_ENV_WORKROOT="${APOLLO_ENV_WORKSPACE}"
178+
fi
173179
shift
174180
;;
175181
--image)

aem/ansible/env-minimal.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
include_role:
2424
name: apolloauto.dev_env.cyber_deps
2525

26-
# - name: Install Modules Base Dependencies
27-
# include_role:
28-
# name: apolloauto.dev_env.modules_base
29-
#
26+
- name: Install Modules Base Dependencies
27+
include_role:
28+
name: apolloauto.dev_env.modules_base
29+
3030
- name: Install Oridinary Modules Dependencies
3131
include_role:
3232
name: apolloauto.dev_env.ordinary_modules

0 commit comments

Comments
 (0)