Merge pull request tier4#178 from tier4/sync-upstream

chore: sync upstream

.github/sync-files.yaml

@@ -5,6 +5,7 @@
     - source: .github/workflows/pre-commit-optional.yaml
     - source: .github/workflows/semantic-pull-request.yaml
     - source: .github/workflows/spell-check-differential.yaml
+    - source: .github/workflows/sync-files.yaml
     - source: .markdown-link-check.json
     - source: .markdownlint.yaml
     - source: .pre-commit-config-optional.yaml
@@ -17,4 +18,3 @@
   files:
     - source: .github/workflows/build-and-test.yaml
     - source: .github/workflows/build-and-test-differential.yaml
-    - source: .github/workflows/sync-files.yaml

.github/workflows/sync-files.yaml

@@ -20,3 +20,4 @@ jobs:
         uses: autowarefoundation/autoware-github-actions/sync-files@v1
         with:
           token: ${{ steps.generate-token.outputs.token }}
+          auto-merge-method: squash

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: check-json
       - id: check-merge-conflict

localization_launch/launch/localization.launch.xml

@@ -1,14 +1,18 @@
 <?xml version="1.0"?>
 <launch>
-  <!-- localization module -->
-
+  <arg name="input/pointcloud" default="/sensing/lidar/top/rectified/pointcloud" description="The topic will be used in the localization util module"/>
+  <arg name="container" default="/sensing/lidar/top/pointcloud_preprocessor/velodyne_node_container"/>
   <arg name="map_name"/>
+
+  <!-- localization module -->
   <group>
     <push-ros-namespace namespace="localization"/>
     <!-- util module -->
     <group>
       <push-ros-namespace namespace="util"/>
       <include file="$(find-pkg-share localization_launch)/launch/util/util.launch.xml">
+        <arg name="input/pointcloud" value="$(var input/pointcloud)" />
+        <arg name="container" value="$(var container)"/>
         <arg name="map_name" value="$(var map_name)"/>
       </include>
     </group>

localization_launch/launch/util/util.launch.py

@@ -106,16 +106,7 @@ def add_launch_arg(name: str, default_value=None, description=None):
         "path to the parameter file of random_downsample_filter",
     )
     add_launch_arg("use_intra_process", "true", "use ROS2 component container communication")
-    add_launch_arg(
-        "container",
-        "/sensing/lidar/top/pointcloud_preprocessor/velodyne_node_container",
-        "container name",
-    )
-    add_launch_arg(
-        "input/pointcloud",
-        "/sensing/lidar/top/rectified/pointcloud",
-        "input topic name for raw pointcloud",
-    )
+
     add_launch_arg(
         "output/pointcloud",
         "downsample/pointcloud",

localization_launch/launch/util/util.launch.xml

@@ -3,14 +3,9 @@
   <arg name="map_name"/>
   <let name="environment_params_config" value="$(find-pkg-share environment_params)/config"/>
 
-  <!-- Topics -->
-  <arg name="input/pointcloud"  default="/sensing/lidar/top/rectified/pointcloud" description="input topic name"/>
+  <arg name="input/pointcloud" description="input topic name"/>
   <arg name="output/pointcloud" default="downsample/pointcloud" description="final output topic name"/>
-
-  <!-- container -->
-  <arg name="container" default="/sensing/lidar/top/pointcloud_preprocessor/velodyne_node_container"  description="container name"/>
-
-  <!-- option -->
+  <arg name="container" description="container name which input topic belongs"/>
   <arg name="use_intra_process" default="true" description="use ROS2 component container communication"/>
 
   <!-- pose_initializer -->

perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
 <launch>
+  <arg name="input/pointcloud" />
+  <arg name="input/obstacle_segmentation/pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
   <arg name="image_raw0" default="/image_raw" description="image raw topic name"/>
   <arg name="camera_info0" default="/camera_info" description="camera info topic name"/>
   <arg name="image_raw1" default="/image_raw1"/>
@@ -19,7 +21,6 @@
   <arg name="image_number" default="1" description="choose image raw number(0-7)"/>
   <arg name="lidar_detection_model" default="centerpoint" description="options: `centerpoint`, `apollo`"/>
   <arg name="use_pointcloud_map" default="true" description="use pointcloud map in detection"/>
-  <arg name="input_pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
 
   <!-- Jetson AGX -->
   <!-- <include file="$(find-pkg-share tensorrt_yolo)/launch/yolo.launch.xml">
@@ -37,7 +38,7 @@
   <!-- Pointcloud map filter -->
   <group>
     <include file="$(find-pkg-share compare_map_segmentation)/launch/voxel_based_compare_map_filter.launch.xml" if="$(var use_pointcloud_map)">
-      <arg name="input" value="$(var input_pointcloud)" />
+      <arg name="input" value="$(var input/obstacle_segmentation/pointcloud)" />
       <arg name="input_map" value="/map/pointcloud_map" />
       <arg name="output" value="pointcloud_map_filtered/pointcloud" />
       <arg name="distance_threshold" value="0.5" />
@@ -47,7 +48,7 @@
   <group>
     <push-ros-namespace namespace="clustering"/>
     <let name="clustering/input/pointcloud" value="/perception/object_recognition/detection/pointcloud_map_filtered/pointcloud" if="$(var use_pointcloud_map)"/>
-    <let name="clustering/input/pointcloud" value="$(var input_pointcloud)" unless="$(var use_pointcloud_map)"/>
+    <let name="clustering/input/pointcloud" value="$(var input/obstacle_segmentation/pointcloud)" unless="$(var use_pointcloud_map)"/>
     <include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml">
       <arg name="input_pointcloud" value="$(var clustering/input/pointcloud)"/>
       <arg name="output_clusters" value="clusters"/>
@@ -110,6 +111,7 @@
   <group if="$(eval &quot;'$(var lidar_detection_model)'=='centerpoint'&quot;)">
     <push-ros-namespace namespace="centerpoint"/>
     <include file="$(find-pkg-share lidar_centerpoint)/launch/lidar_centerpoint.launch.xml">
+      <arg name="input/pointcloud" value="$(var input/pointcloud)"/>
       <arg name="output/objects" value="objects" />
     </include>
   </group>
@@ -118,7 +120,9 @@
   <group if="$(eval &quot;'$(var lidar_detection_model)'=='apollo'&quot;)">
     <push-ros-namespace namespace="apollo"/>
     <group>
-      <include file="$(find-pkg-share lidar_apollo_instance_segmentation)/launch/lidar_apollo_instance_segmentation.launch.xml" />
+      <include file="$(find-pkg-share lidar_apollo_instance_segmentation)/launch/lidar_apollo_instance_segmentation.launch.xml">
+        <arg name="input/pointcloud" value="$(var input/pointcloud)"/>
+      </include>
       <include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
         <arg name="output/objects" value="objects_with_feature"/>
         <arg name="use_vehicle_reference_yaw" value="true"/>
@@ -134,7 +138,7 @@
   <!-- Validator -->
   <group>
     <let name="validator/input/obstacle_pointcloud" value="/perception/object_recognition/detection/pointcloud_map_filtered/pointcloud" if="$(var use_pointcloud_map)"/>
-    <let name="validator/input/obstacle_pointcloud" value="$(var input_pointcloud)" unless="$(var use_pointcloud_map)"/>
+    <let name="validator/input/obstacle_pointcloud" value="$(var input/obstacle_segmentation/pointcloud)" unless="$(var use_pointcloud_map)"/>
     <include file="$(find-pkg-share detected_object_validation)/launch/obstacle_pointcloud_based_validator.launch.xml">
       <arg name="input/detected_objects" value="$(var lidar_detection_model)/objects"/>
       <arg name="input/obstacle_pointcloud" value="$(var validator/input/obstacle_pointcloud)"/>

perception_launch/launch/object_recognition/detection/detection.launch.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
 <launch>
+  <arg name="input/pointcloud" />
   <arg name="mode" default="camera_lidar_fusion" description="options: `camera_lidar_fusion`, `lidar` or `camera`"/>
   <arg name="lidar_detection_model" default="centerpoint" description="options: `centerpoint`, `apollo`"/>
   <!-- "camera_lidar_fusion", "lidar" or "camera" -->
@@ -26,6 +27,7 @@
   <!-- camera lidar fusion based detection-->
   <group if="$(eval '&quot;$(var mode)&quot;==&quot;camera_lidar_fusion&quot;')">
     <include file="$(find-pkg-share perception_launch)/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml">
+      <arg name="input/pointcloud" value="$(var input/pointcloud)"/>
       <arg name="image_raw0" value="$(var image_raw0)"/>
       <arg name="camera_info0" value="$(var camera_info0)"/>
       <arg name="image_raw1" value="$(var image_raw1)"/>
@@ -50,6 +52,7 @@
   <!-- lidar based detection-->
   <group if="$(eval '&quot;$(var mode)&quot;==&quot;lidar&quot;')">
     <include file="$(find-pkg-share perception_launch)/launch/object_recognition/detection/lidar_based_detection.launch.xml">
+      <arg name="input/pointcloud" value="$(var input/pointcloud)"/>
       <arg name="lidar_detection_model" value="$(var lidar_detection_model)"/>
       <arg name="use_pointcloud_map" value="$(var use_pointcloud_map)"/>
     </include>

perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
 <launch>
+  <arg name="input/pointcloud"/>
+  <arg name="input/obstacle_segmentation/pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
   <arg name="lidar_detection_model" default="centerpoint" description="options: `centerpoint`, `apollo`"/>
   <arg name="use_pointcloud_map" default="true" description="use pointcloud map in detection"/>
-  <arg name="input_pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
 
   <!-- Pointcloud map filter -->
   <group>
     <include file="$(find-pkg-share compare_map_segmentation)/launch/voxel_based_compare_map_filter.launch.xml" if="$(var use_pointcloud_map)">
-      <arg name="input" value="$(var input_pointcloud)" />
+      <arg name="input" value="$(var input/obstacle_segmentation/pointcloud)" />
       <arg name="input_map" value="/map/pointcloud_map" />
       <arg name="output" value="pointcloud_map_filtered/pointcloud" />
       <arg name="distance_threshold" value="0.5" />
@@ -18,7 +19,7 @@
   <group>
     <push-ros-namespace namespace="clustering"/>
     <let name="clustering/input/pointcloud" value="/perception/object_recognition/detection/pointcloud_map_filtered/pointcloud" if="$(var use_pointcloud_map)"/>
-    <let name="clustering/input/pointcloud" value="$(var input_pointcloud)" unless="$(var use_pointcloud_map)"/>
+    <let name="clustering/input/pointcloud" value="$(var input/obstacle_segmentation/pointcloud)" unless="$(var use_pointcloud_map)"/>
     <include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml">
       <arg name="input_pointcloud" value="$(var clustering/input/pointcloud)"/>
       <arg name="output_clusters" value="clusters"/>
@@ -37,15 +38,19 @@
   <group if="$(eval &quot;'$(var lidar_detection_model)'=='centerpoint'&quot;)">
     <push-ros-namespace namespace="centerpoint"/>
     <group>
-      <include file="$(find-pkg-share lidar_centerpoint)/launch/lidar_centerpoint.launch.xml" />
+      <include file="$(find-pkg-share lidar_centerpoint)/launch/lidar_centerpoint.launch.xml">
+        <arg name="input/pointcloud" value="$(var input/pointcloud)"/>
+      </include>
     </group>
   </group>
 
   <!-- Lidar Apollo Instance Segmentation -->
   <group if="$(eval &quot;'$(var lidar_detection_model)'=='apollo'&quot;)">
     <push-ros-namespace namespace="apollo"/>
     <group>
-      <include file="$(find-pkg-share lidar_apollo_instance_segmentation)/launch/lidar_apollo_instance_segmentation.launch.xml" />
+      <include file="$(find-pkg-share lidar_apollo_instance_segmentation)/launch/lidar_apollo_instance_segmentation.launch.xml">
+        <arg name="input/pointcloud" value="$(var input/pointcloud)"/>
+      </include>
       <include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
         <arg name="output/objects" value="objects_with_feature"/>
         <arg name="use_vehicle_reference_yaw" value="true"/>
@@ -61,7 +66,7 @@
   <!-- Validator -->
   <group>
     <let name="validator/input/obstacle_pointcloud" value="/perception/object_recognition/detection/pointcloud_map_filtered/pointcloud" if="$(var use_pointcloud_map)"/>
-    <let name="validator/input/obstacle_pointcloud" value="$(var input_pointcloud)" unless="$(var use_pointcloud_map)"/>
+    <let name="validator/input/obstacle_pointcloud" value="$(var input/obstacle_segmentation/pointcloud)" unless="$(var use_pointcloud_map)"/>
     <include file="$(find-pkg-share detected_object_validation)/launch/obstacle_pointcloud_based_validator.launch.xml">
       <arg name="input/detected_objects" value="$(var lidar_detection_model)/objects"/>
       <arg name="input/obstacle_pointcloud" value="$(var validator/input/obstacle_pointcloud)"/>

perception_launch/launch/perception.launch.xml

@@ -2,6 +2,7 @@
 
 <launch>
   <!-- common parameters -->
+  <arg name="input/pointcloud" default="/sensing/lidar/concatenated/pointcloud" description="The topic will be used in the detection module"/>
   <arg name="mode" default="camera_lidar_fusion" description="options: `camera_lidar_fusion`, `lidar` or `camera`"/>
   <arg name="image_raw0" default="/sensing/camera/camera0/image_rect_color" description="image raw topic name"/>
   <arg name="camera_info0" default="/sensing/camera/camera0/camera_info" description="camera info topic name"/>
@@ -64,6 +65,7 @@
         <push-ros-namespace namespace="detection"/>
         <include file="$(find-pkg-share perception_launch)/launch/object_recognition/detection/detection.launch.xml">
           <arg name="mode" value="$(var mode)"/>
+          <arg name="input/pointcloud" value="$(var input/pointcloud)"/>
           <arg name="image_raw0" value="$(var image_raw0)"/>
           <arg name="camera_info0" value="$(var camera_info0)"/>
           <arg name="image_raw1" value="$(var image_raw1)"/>

planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.py

@@ -129,6 +129,7 @@ def generate_launch_description():
             ("~/input/vector_map", LaunchConfiguration("map_topic_name")),
             ("~/input/perception", "/perception/object_recognition/objects"),
             ("~/input/odometry", "/localization/kinematic_state"),
+            ("~/input/scenario", "/planning/scenario_planning/scenario"),
             (
                 "~/input/external_approval",
                 "/planning/scenario_planning/lane_driving/behavior_planning/"