change email of cyberfile

Change-Id: Ieb5cb93d0c163e3b3b0c0b48a60c6d4eb1e5bfee

BUILD

@@ -18,6 +18,7 @@ install(
         "//modules/v2x:install",
         "//third_party/centerpoint_infer_op:install",
         "//third_party/paddleinference:install",
+        "//third_party/caddn_infer_op:install",
     ], [
         "//cyber:install",
         "//tools:install",
@@ -47,7 +48,7 @@ install(
         "//modules/third_party_perception:install",
         "//modules/tools:install",
         "//modules/transform:install",
-        #"//scripts:install",
+        "//scripts:install",
         "//third_party/absl:install",
         "//third_party/ad_rss_lib:install",
         "//third_party/boost:install",
@@ -104,6 +105,7 @@ install_src_files(
         "//modules/v2x:install_src",
         "//third_party/centerpoint_infer_op:install_src",
         "//third_party/paddleinference:install_src",
+        "//third_party/caddn_infer_op:install_src",
     ], [
         "//cyber:install_src",
         "//tools:install_src",

cyber/cyberfile.xml

@@ -6,7 +6,7 @@
     Based on a centralized computing model, it is greatly optimized for high concurrency, low latency, and high throughput in autonomous driving.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/audio/cyberfile.xml

@@ -7,7 +7,7 @@
   When active emergency vehicles detected, you can also see active alerts on Dreamview.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/bridge/cyberfile.xml

@@ -6,7 +6,7 @@
     outside of Apollo by socket. It includes sender and receiver components.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/calibration/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo calibration module.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/canbus/cyberfile.xml

@@ -5,7 +5,7 @@
     Canbus accepts and executes control module commands and collects the car's chassis status as feedback to control.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/common/cyberfile.xml

@@ -5,7 +5,7 @@
     This module contains code that is not specific to any module but is useful for the functioning of Apollo.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/common_msgs/cyberfile.xml

@@ -5,7 +5,7 @@
     This module contains code that is not specific to any module but is useful for the functioning of Apollo.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/contrib/cyber_bridge/cyberfile.xml

@@ -5,7 +5,7 @@
     This is bridge that exposes custom TCP socket for accepting and transmitting Cyber messages.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/control/cyberfile.xml

@@ -6,7 +6,7 @@
     algorithms to generate a comfortable driving experience.The Control module can work both in normal and navigation modes.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/dreamview/cyberfile.xml

@@ -6,7 +6,7 @@
     other relevant autonomous driving modules, e.g. the vehicle's planning trajectory, car localization, chassis status etc.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/drivers/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo drivers module.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/guardian/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo guardian module.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/localization/cyberfile.xml

@@ -7,7 +7,7 @@
     - The  multi-sensor fusion method which incorporates GPS, IMU, and LiDAR information.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/map/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo map module.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/monitor/cyberfile.xml

@@ -6,7 +6,7 @@
     and monitor system health.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/perception/camera/tools/obstacle_detection/data/yolo/3d-r4-half

@@ -1 +1 @@
-../../../../../production/data/perception/camera/models/yolo_obstacle_detector/3d-r4-half
+/apollo/modules/perception/production/data/perception/camera/models/yolo_obstacle_detector/3d-r4-half_caffe

modules/perception/cyberfile.xml

@@ -10,7 +10,7 @@
     relative location to the ego-vehicle (L0, L1, R0, R1, etc.).
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>
@@ -36,6 +36,7 @@
 
   <depend expose="False">3rd-rules-python-dev</depend>
   <depend expose="False">3rd-centerpoint-infer-op-dev</depend>
+  <depend expose="False">3rd-caddn-infer-op-dev</depend>
   <depend expose="False">3rd-paddleinference-dev</depend>
   <depend expose="False">3rd-tensorrt-dev</depend>
   <depend expose="False">3rd-vtk-dev</depend>

modules/planning/cyberfile_cpu.xml

@@ -5,7 +5,7 @@
     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.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/planning/cyberfile_gpu.xml

@@ -5,7 +5,7 @@
     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.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/planning/proto/BUILD

@@ -2,13 +2,17 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@rules_cc//cc:defs.bzl", "cc_proto_library")
 load("//tools/install:install.bzl", "install", "install_files")
+load("//tools/platform:build_defs.bzl", "if_gpu")
 load("//tools:python_rules.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
 install_files(
     name = "py_pb_planning",
-    dest = "planning/python/modules/planning/proto",
+    dest = if_gpu(
+        "planning/python/modules/planning/proto", 
+        "planning-gpu/python/modules/planning/proto", 
+    ),
     files = [
         ":st_drivable_boundary_py_pb2",
         ":planning_stats_py_pb2",

modules/prediction/cyberfile.xml

@@ -7,7 +7,7 @@
     accelerations, and then generates predicted trajectories with probabilities for those obstacles.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/routing/cyberfile.xml

@@ -6,7 +6,7 @@
     The Routing module depends on a routing topology file, usually named `routing_map.*` in apollo.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/storytelling/cyberfile.xml

@@ -10,7 +10,7 @@
     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. 
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/task_manager/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo task_manager module.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/third_party_perception/cyberfile.xml

@@ -8,7 +8,7 @@
     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.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/tools/BUILD

@@ -110,6 +110,6 @@ install_src_files(
 install_src_files(
     name = "install_tools_py",
     src_dir = ["."],
-    dest = "tools/python",
+    dest = "tools/python/modules/tools",
     filter = "*.py",
 )

modules/tools/cyberfile.xml

@@ -6,7 +6,7 @@
     generally you need to do the following steps to make it function well.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/transform/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo transform module.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

modules/v2x/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo v2x module.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

scripts/after_install.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Copyright 2017 The Apollo Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###############################################################################
+
+TOP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
+APOLLO_OUTPUT="/opt/apollo/neo/packages"
+clear_dev_scripts=${TOP_DIR}/scripts/clear.py
+
+dreamview_launch=${APOLLO_OUTPUT}/dreamview-dev/local/launch/dreamview.launch
+dreamview_src_launch=${APOLLO_OUTPUT}/dreamview-dev/local/src/launch/dreamview.launch
+planning_dag=${APOLLO_OUTPUT}/planning-dev/local/dag/planning.dag
+planning_src_dag=${APOLLO_OUTPUT}/planning-dev/local/src/dag/planning.dag
+
+sed -i "s/\/apollo\/bazel-bin\/modules\/dreamview\/dreamview/dreamview/g" $dreamview_launch
+sed -i "s/\/apollo\/bazel-bin\/modules\/dreamview\/dreamview/dreamview/g" $dreamview_src_launch
+
+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
+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
+
+python3 $clear_dev_scripts
+

scripts/clear.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+###############################################################################
+# Copyright 2018 The Apollo Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###############################################################################
+"""
+clear the extra -dev due to install rule
+"""
+import os
+from pathlib import Path
+
+output_dir = "/opt/apollo/neo/packages"
+
+if __name__ == "__main__":
+    for d in os.listdir(output_dir):
+        d_wrapper = Path(os.path.join(output_dir, d))
+        cyberfile = d_wrapper / "local" / "cyberfile.xml"
+        if cyberfile.exists():
+            content = None
+            with cyberfile.open("r") as f:
+                content = f.read()
+            while "-dev-dev" in content:
+                content = content.replace("-dev-dev", "-dev")
+            with cyberfile.open("w+") as f:
+                f.write(content)

scripts/cyberfile.xml

@@ -5,7 +5,7 @@
     Some apollo origin scripts.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

third_party/absl/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo packaged absl Lib.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>

third_party/ad_rss_lib/cyberfile.xml

@@ -5,7 +5,7 @@
     Apollo packaged 3rd-ad-rss-lib Lib.
   </description>
 
-  <maintainer email="apollo-maintainer@baidu.com">Apollo</maintainer>
+  <maintainer email="apollo-support@baidu.com">Apollo</maintainer>
   <license>Apache License 2.0</license>
   <url type="website">https://www.apollo.auto/</url>
   <url type="repository">https://github.com/ApolloAuto/apollo</url>