Skip to content

Commit ff1008b

Browse files
change email of cyberfile
Change-Id: Ieb5cb93d0c163e3b3b0c0b48a60c6d4eb1e5bfee
1 parent 97ed01f commit ff1008b

File tree

80 files changed

+156
-77
lines changed

Some content is hidden

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

80 files changed

+156
-77
lines changed

BUILD

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ install(
1818
"//modules/v2x:install",
1919
"//third_party/centerpoint_infer_op:install",
2020
"//third_party/paddleinference:install",
21+
"//third_party/caddn_infer_op:install",
2122
], [
2223
"//cyber:install",
2324
"//tools:install",
@@ -47,7 +48,7 @@ install(
4748
"//modules/third_party_perception:install",
4849
"//modules/tools:install",
4950
"//modules/transform:install",
50-
#"//scripts:install",
51+
"//scripts:install",
5152
"//third_party/absl:install",
5253
"//third_party/ad_rss_lib:install",
5354
"//third_party/boost:install",
@@ -104,6 +105,7 @@ install_src_files(
104105
"//modules/v2x:install_src",
105106
"//third_party/centerpoint_infer_op:install_src",
106107
"//third_party/paddleinference:install_src",
108+
"//third_party/caddn_infer_op:install_src",
107109
], [
108110
"//cyber:install_src",
109111
"//tools:install_src",

cyber/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Based on a centralized computing model, it is greatly optimized for high concurrency, low latency, and high throughput in autonomous driving.
77
</description>
88

9-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
9+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1010
<license>Apache License 2.0</license>
1111
<url type="website">https://www.apollo.auto/</url>
1212
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/audio/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
When active emergency vehicles detected, you can also see active alerts on Dreamview.
88
</description>
99

10-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
10+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1111
<license>Apache License 2.0</license>
1212
<url type="website">https://www.apollo.auto/</url>
1313
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/bridge/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
outside of Apollo by socket. It includes sender and receiver components.
77
</description>
88

9-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
9+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1010
<license>Apache License 2.0</license>
1111
<url type="website">https://www.apollo.auto/</url>
1212
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/calibration/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo calibration module.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/canbus/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Canbus accepts and executes control module commands and collects the car's chassis status as feedback to control.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/common/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This module contains code that is not specific to any module but is useful for the functioning of Apollo.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/common_msgs/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This module contains code that is not specific to any module but is useful for the functioning of Apollo.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/contrib/cyber_bridge/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This is bridge that exposes custom TCP socket for accepting and transmitting Cyber messages.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/control/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
algorithms to generate a comfortable driving experience.The Control module can work both in normal and navigation modes.
77
</description>
88

9-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
9+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1010
<license>Apache License 2.0</license>
1111
<url type="website">https://www.apollo.auto/</url>
1212
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/dreamview/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
other relevant autonomous driving modules, e.g. the vehicle's planning trajectory, car localization, chassis status etc.
77
</description>
88

9-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
9+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1010
<license>Apache License 2.0</license>
1111
<url type="website">https://www.apollo.auto/</url>
1212
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/drivers/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo drivers module.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/guardian/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo guardian module.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/localization/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- The multi-sensor fusion method which incorporates GPS, IMU, and LiDAR information.
88
</description>
99

10-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
10+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1111
<license>Apache License 2.0</license>
1212
<url type="website">https://www.apollo.auto/</url>
1313
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/localization/msf/params/gnss_params/BUILD

Whitespace-only changes.

modules/map/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo map module.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/monitor/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
and monitor system health.
77
</description>
88

9-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
9+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1010
<license>Apache License 2.0</license>
1111
<url type="website">https://www.apollo.auto/</url>
1212
<url type="repository">https://github.com/ApolloAuto/apollo</url>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../../production/data/perception/camera/models/yolo_obstacle_detector/3d-r4-half
1+
/apollo/modules/perception/production/data/perception/camera/models/yolo_obstacle_detector/3d-r4-half_caffe

modules/perception/cyberfile.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
relative location to the ego-vehicle (L0, L1, R0, R1, etc.).
1111
</description>
1212

13-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
13+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1414
<license>Apache License 2.0</license>
1515
<url type="website">https://www.apollo.auto/</url>
1616
<url type="repository">https://github.com/ApolloAuto/apollo</url>
@@ -36,6 +36,7 @@
3636

3737
<depend expose="False">3rd-rules-python-dev</depend>
3838
<depend expose="False">3rd-centerpoint-infer-op-dev</depend>
39+
<depend expose="False">3rd-caddn-infer-op-dev</depend>
3940
<depend expose="False">3rd-paddleinference-dev</depend>
4041
<depend expose="False">3rd-tensorrt-dev</depend>
4142
<depend expose="False">3rd-vtk-dev</depend>

modules/planning/cyberfile_cpu.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Compared with previous versions, Apollo 7.0 adds a new dead end scenario, adds the "three-point turn", increases vehicle driving in and out ability, and expands the operation boundary of the urban road network. The "three-point turn" function is based on the open space planner framework and includes the following parts: scene conversion of dead ends, construction of open space ROI, and "three-point turn" trajectory planning.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/planning/cyberfile_gpu.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Compared with previous versions, Apollo 7.0 adds a new dead end scenario, adds the "three-point turn", increases vehicle driving in and out ability, and expands the operation boundary of the urban road network. The "three-point turn" function is based on the open space planner framework and includes the following parts: scene conversion of dead ends, construction of open space ROI, and "three-point turn" trajectory planning.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/planning/proto/BUILD

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
load("@rules_proto//proto:defs.bzl", "proto_library")
33
load("@rules_cc//cc:defs.bzl", "cc_proto_library")
44
load("//tools/install:install.bzl", "install", "install_files")
5+
load("//tools/platform:build_defs.bzl", "if_gpu")
56
load("//tools:python_rules.bzl", "py_proto_library")
67

78
package(default_visibility = ["//visibility:public"])
89

910
install_files(
1011
name = "py_pb_planning",
11-
dest = "planning/python/modules/planning/proto",
12+
dest = if_gpu(
13+
"planning/python/modules/planning/proto",
14+
"planning-gpu/python/modules/planning/proto",
15+
),
1216
files = [
1317
":st_drivable_boundary_py_pb2",
1418
":planning_stats_py_pb2",

modules/prediction/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
accelerations, and then generates predicted trajectories with probabilities for those obstacles.
88
</description>
99

10-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
10+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1111
<license>Apache License 2.0</license>
1212
<url type="website">https://www.apollo.auto/</url>
1313
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/routing/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
The Routing module depends on a routing topology file, usually named `routing_map.*` in apollo.
77
</description>
88

9-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
9+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1010
<license>Apache License 2.0</license>
1111
<url type="website">https://www.apollo.auto/</url>
1212
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/storytelling/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
this module creates one or multiple stories and publishes to `/apollo/storytelling` channel. The main advantage of this module is to fine tune the driving experience and also isolate complex scenarios packaging them into stories that can be subscribed to by other modules like Planning, Control etc.
1111
</description>
1212

13-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
13+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1414
<license>Apache License 2.0</license>
1515
<url type="website">https://www.apollo.auto/</url>
1616
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/task_manager/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo task_manager module.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/third_party_perception/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
This module was only intend to serve for the Prediction/Planning/Control algorithm in real vehicle before perception modules fully ready before 2.5. We recommend using 'modules/perception' instead for your own test purpose after Apollo 2.5 officially released.
99
</description>
1010

11-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
11+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1212
<license>Apache License 2.0</license>
1313
<url type="website">https://www.apollo.auto/</url>
1414
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/tools/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,6 @@ install_src_files(
110110
install_src_files(
111111
name = "install_tools_py",
112112
src_dir = ["."],
113-
dest = "tools/python",
113+
dest = "tools/python/modules/tools",
114114
filter = "*.py",
115115
)

modules/tools/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
generally you need to do the following steps to make it function well.
77
</description>
88

9-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
9+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
1010
<license>Apache License 2.0</license>
1111
<url type="website">https://www.apollo.auto/</url>
1212
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/transform/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo transform module.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/v2x/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo v2x module.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

scripts/after_install.sh

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
3+
###############################################################################
4+
# Copyright 2017 The Apollo Authors. All Rights Reserved.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
###############################################################################
18+
19+
TOP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
20+
APOLLO_OUTPUT="/opt/apollo/neo/packages"
21+
clear_dev_scripts=${TOP_DIR}/scripts/clear.py
22+
23+
dreamview_launch=${APOLLO_OUTPUT}/dreamview-dev/local/launch/dreamview.launch
24+
dreamview_src_launch=${APOLLO_OUTPUT}/dreamview-dev/local/src/launch/dreamview.launch
25+
planning_dag=${APOLLO_OUTPUT}/planning-dev/local/dag/planning.dag
26+
planning_src_dag=${APOLLO_OUTPUT}/planning-dev/local/src/dag/planning.dag
27+
28+
sed -i "s/\/apollo\/bazel-bin\/modules\/dreamview\/dreamview/dreamview/g" $dreamview_launch
29+
sed -i "s/\/apollo\/bazel-bin\/modules\/dreamview\/dreamview/dreamview/g" $dreamview_src_launch
30+
31+
sed -i "s/\/opt\/apollo\/neo\/packages\/planning-gpu-dev\/latest\/lib\/libplanning_component.so/\/opt\/apollo\/neo\/packages\/planning-dev\/latest\/lib\/libplanning_component.so/g" $planning_dag
32+
sed -i "s/\/opt\/apollo\/neo\/packages\/planning-gpu-dev\/latest\/lib\/libplanning_component.so/\/opt\/apollo\/neo\/packages\/planning-dev\/latest\/lib\/libplanning_component.so/g" $planning_src_dag
33+
34+
python3 $clear_dev_scripts
35+

scripts/clear.py

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/usr/bin/env python3
2+
3+
###############################################################################
4+
# Copyright 2018 The Apollo Authors. All Rights Reserved.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
###############################################################################
18+
"""
19+
clear the extra -dev due to install rule
20+
"""
21+
import os
22+
from pathlib import Path
23+
24+
output_dir = "/opt/apollo/neo/packages"
25+
26+
if __name__ == "__main__":
27+
for d in os.listdir(output_dir):
28+
d_wrapper = Path(os.path.join(output_dir, d))
29+
cyberfile = d_wrapper / "local" / "cyberfile.xml"
30+
if cyberfile.exists():
31+
content = None
32+
with cyberfile.open("r") as f:
33+
content = f.read()
34+
while "-dev-dev" in content:
35+
content = content.replace("-dev-dev", "-dev")
36+
with cyberfile.open("w+") as f:
37+
f.write(content)

scripts/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Some apollo origin scripts.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

third_party/absl/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo packaged absl Lib.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

third_party/ad_rss_lib/cyberfile.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Apollo packaged 3rd-ad-rss-lib Lib.
66
</description>
77

8-
<maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
8+
<maintainer email="apollo-support@baidu.com">Apollo</maintainer>
99
<license>Apache License 2.0</license>
1010
<url type="website">https://www.apollo.auto/</url>
1111
<url type="repository">https://github.com/ApolloAuto/apollo</url>

0 commit comments

Comments
 (0)