Skip to content

Commit 156d005

Browse files
authored
feat(tier4_perception_launch): declare param path argument (autowarefoundation#1394)
* feat(tier4_perception_launch): declare param path argument Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com> * Update launch/tier4_perception_launch/launch/perception.launch.xml * fix ci error Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com> * fix ci error Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
1 parent 65cafdf commit 156d005

File tree

7 files changed

+35
-13
lines changed

7 files changed

+35
-13
lines changed

launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
22
<launch>
3+
<arg name="tier4_perception_launch_param_path"/>
34
<arg name="input/pointcloud"/>
45
<arg name="input/obstacle_segmentation/pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
56
<arg name="output/objects" default="objects"/>
@@ -42,6 +43,7 @@
4243
<!-- Pointcloud map filter -->
4344
<group>
4445
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/pointcloud_map_filter.launch.py" if="$(var use_pointcloud_map)">
46+
<arg name="tier4_perception_launch_param_path" value="$(var tier4_perception_launch_param_path)"/>
4547
<arg name="input_topic" value="$(var input/obstacle_segmentation/pointcloud)"/>
4648
<arg name="output_topic" value="pointcloud_map_filtered/pointcloud"/>
4749
<arg name="use_intra_process" value="true"/>
@@ -224,7 +226,7 @@
224226
<include file="$(find-pkg-share detected_object_validation)/launch/object_lanelet_filter.launch.xml">
225227
<arg name="input/object" value="objects_before_filter"/>
226228
<arg name="output/object" value="$(var output/objects)"/>
227-
<arg name="filtering_range_param" value="$(find-pkg-share tier4_perception_launch)/config/object_recognition/detection/object_lanelet_filter.param.yaml"/>
229+
<arg name="filtering_range_param" value="$(var tier4_perception_launch_param_path)/object_recognition/detection/object_lanelet_filter.param.yaml"/>
228230
</include>
229231
</group>
230232
</launch>

launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
22
<launch>
3+
<arg name="tier4_perception_launch_param_path"/>
34
<arg name="mode" default="lidar" description="options: `camera_lidar_radar_fusion`, `camera_lidar_fusion`, `lidar_radar_fusion`, `lidar` or `radar`"/>
45

56
<!-- lidar param -->
@@ -61,6 +62,7 @@
6162
<!-- camera lidar fusion based detection-->
6263
<group if="$(eval '&quot;$(var mode)&quot;==&quot;camera_lidar_fusion&quot;')">
6364
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml">
65+
<arg name="tier4_perception_launch_param_path" value="$(var tier4_perception_launch_param_path)"/>
6466
<arg name="input/pointcloud" value="$(var input/pointcloud)"/>
6567
<arg name="image_raw0" value="$(var image_raw0)"/>
6668
<arg name="camera_info0" value="$(var camera_info0)"/>
@@ -100,6 +102,7 @@
100102
<!-- lidar based detection-->
101103
<group if="$(eval '&quot;$(var mode)&quot;==&quot;lidar&quot;')">
102104
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/lidar_based_detection.launch.xml">
105+
<arg name="tier4_perception_launch_param_path" value="$(var tier4_perception_launch_param_path)"/>
103106
<arg name="input/pointcloud" value="$(var input/pointcloud)"/>
104107
<arg name="lidar_detection_model" value="$(var lidar_detection_model)"/>
105108
<arg name="use_pointcloud_map" value="$(var use_pointcloud_map)"/>

launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
22
<launch>
3+
<arg name="tier4_perception_launch_param_path"/>
34
<arg name="input/pointcloud"/>
45
<arg name="input/obstacle_segmentation/pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
56
<arg name="output/objects" default="objects"/>
@@ -12,6 +13,7 @@
1213
<!-- Pointcloud map filter -->
1314
<group>
1415
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/pointcloud_map_filter.launch.py" if="$(var use_pointcloud_map)">
16+
<arg name="tier4_perception_launch_param_path" value="$(var tier4_perception_launch_param_path)"/>
1517
<arg name="input_topic" value="$(var input/obstacle_segmentation/pointcloud)"/>
1618
<arg name="output_topic" value="pointcloud_map_filtered/pointcloud"/>
1719
<arg name="use_intra_process" value="true"/>
@@ -128,7 +130,7 @@
128130
<include file="$(find-pkg-share detected_object_validation)/launch/object_lanelet_filter.launch.xml">
129131
<arg name="input/object" value="objects_before_filter"/>
130132
<arg name="output/object" value="$(var output/objects)"/>
131-
<arg name="filtering_range_param" value="$(find-pkg-share tier4_perception_launch)/config/object_recognition/detection/object_lanelet_filter.param.yaml"/>
133+
<arg name="filtering_range_param" value="$(var tier4_perception_launch_param_path)/object_recognition/detection/object_lanelet_filter.param.yaml"/>
132134
</include>
133135
</group>
134136
</launch>

launch/tier4_perception_launch/launch/object_recognition/detection/pointcloud_map_filter.launch.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414
import os
1515

16-
from ament_index_python.packages import get_package_share_directory
1716
import launch
1817
from launch.actions import DeclareLaunchArgument
1918
from launch.actions import OpaqueFunction
@@ -30,8 +29,8 @@
3029
class PointcloudMapFilterPipeline:
3130
def __init__(self, context):
3231
pointcloud_map_filter_param_path = os.path.join(
33-
get_package_share_directory("tier4_perception_launch"),
34-
"config/object_recognition/detection/pointcloud_map_filter.param.yaml",
32+
LaunchConfiguration("tier4_perception_launch_param_path").perform(context),
33+
"object_recognition/detection/pointcloud_map_filter.param.yaml",
3534
)
3635
with open(pointcloud_map_filter_param_path, "r") as f:
3736
self.pointcloud_map_filter_param = yaml.safe_load(f)["/**"]["ros__parameters"]
@@ -151,6 +150,9 @@ def add_launch_arg(name: str, default_value=None):
151150
add_launch_arg("use_intra_process", "True")
152151
add_launch_arg("use_pointcloud_container", "False")
153152
add_launch_arg("container_name", "pointcloud_map_filter_pipeline_container")
153+
add_launch_arg(
154+
"tier4_perception_launch_param_path", None, "tier4_perception_launch parameter path"
155+
)
154156
set_container_executable = SetLaunchConfiguration(
155157
"container_executable",
156158
"component_container",
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0"?>
22
<launch>
3+
<arg name="tier4_perception_launch_param_path" default="$(find-pkg-share tier4_perception_launch)/config"/>
4+
35
<group>
46
<include file="$(find-pkg-share multi_object_tracker)/launch/multi_object_tracker.launch.xml">
5-
<arg name="data_association_matrix_path" value="$(find-pkg-share tier4_perception_launch)/config/object_recognition/tracking/multi_object_tracker/data_association_matrix.param.yaml"/>
7+
<arg name="data_association_matrix_path" value="$(var tier4_perception_launch_param_path)/object_recognition/tracking/multi_object_tracker/data_association_matrix.param.yaml"/>
68
</include>
79
</group>
810
</launch>

launch/tier4_perception_launch/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414
import os
1515

16-
from ament_index_python.packages import get_package_share_directory
1716
import launch
1817
from launch.actions import DeclareLaunchArgument
1918
from launch.actions import OpaqueFunction
@@ -34,8 +33,8 @@ def __init__(self, context):
3433
self.context = context
3534
self.vehicle_info = self.get_vehicle_info()
3635
ground_segmentation_param_path = os.path.join(
37-
get_package_share_directory("tier4_perception_launch"),
38-
"config/obstacle_segmentation/ground_segmentation/ground_segmentation.param.yaml",
36+
LaunchConfiguration("tier4_perception_launch_param_path").perform(context),
37+
"obstacle_segmentation/ground_segmentation/ground_segmentation.param.yaml",
3938
)
4039
with open(ground_segmentation_param_path, "r") as f:
4140
self.ground_segmentation_param = yaml.safe_load(f)["/**"]["ros__parameters"]
@@ -309,7 +308,7 @@ def create_time_series_outlier_filter_components(input_topic, output_topic):
309308
return components
310309

311310
@staticmethod
312-
def create_single_frame_outlier_filter_components(input_topic, output_topic):
311+
def create_single_frame_outlier_filter_components(input_topic, output_topic, context):
313312
components = []
314313
components.append(
315314
ComposableNode(
@@ -329,8 +328,9 @@ def create_single_frame_outlier_filter_components(input_topic, output_topic):
329328
"inpaint_radius": 1.0,
330329
"param_file_path": PathJoinSubstitution(
331330
[
332-
FindPackageShare("tier4_perception_launch"),
333-
"config",
331+
LaunchConfiguration("tier4_perception_launch_param_path").perform(
332+
context
333+
),
334334
"obstacle_segmentation",
335335
"ground_segmentation",
336336
"elevation_map_parameters.yaml",
@@ -476,6 +476,7 @@ def launch_setup(context, *args, **kwargs):
476476
output_topic=relay_topic
477477
if pipeline.use_time_series_filter
478478
else pipeline.output_topic,
479+
context=context,
479480
)
480481
)
481482
if pipeline.use_time_series_filter:
@@ -517,6 +518,9 @@ def add_launch_arg(name: str, default_value=None):
517518
add_launch_arg("use_intra_process", "True")
518519
add_launch_arg("use_pointcloud_container", "False")
519520
add_launch_arg("container_name", "perception_pipeline_container")
521+
add_launch_arg(
522+
"tier4_perception_launch_param_path", None, "tier4_perception_launch parameter path"
523+
)
520524

521525
set_container_executable = SetLaunchConfiguration(
522526
"container_executable",

launch/tier4_perception_launch/launch/perception.launch.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0"?>
22
<launch>
3+
<!-- parameter path -->
4+
<arg name="tier4_perception_launch_param_path" default="$(find-pkg-share tier4_perception_launch)/config" description="tier4_perception_launch parameter path"/>
5+
36
<!-- common parameters -->
47
<arg name="input/pointcloud" default="/sensing/lidar/concatenated/pointcloud" description="The topic will be used in the detection module"/>
58
<arg name="vehicle_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml" description="path to the file of vehicle info yaml"/>
@@ -40,6 +43,7 @@
4043
<group>
4144
<push-ros-namespace namespace="obstacle_segmentation"/>
4245
<include file="$(find-pkg-share tier4_perception_launch)/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py">
46+
<arg name="tier4_perception_launch_param_path" value="$(var tier4_perception_launch_param_path)"/>
4347
<arg name="base_frame" value="base_link"/>
4448
<arg name="vehicle_param_file" value="$(var vehicle_param_file)"/>
4549
<arg name="use_intra_process" value="true"/>
@@ -71,6 +75,7 @@
7175
<group>
7276
<push-ros-namespace namespace="detection"/>
7377
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detection.launch.xml">
78+
<arg name="tier4_perception_launch_param_path" value="$(var tier4_perception_launch_param_path)"/>
7479
<arg name="mode" value="$(var mode)"/>
7580
<arg name="input/pointcloud" value="$(var input/pointcloud)"/>
7681
<arg name="lidar_detection_model" value="$(var lidar_detection_model)"/>
@@ -99,7 +104,9 @@
99104
<!-- tracking module -->
100105
<group>
101106
<push-ros-namespace namespace="tracking"/>
102-
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/tracking/tracking.launch.xml"/>
107+
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/tracking/tracking.launch.xml">
108+
<arg name="tier4_perception_launch_param_path" value="$(var tier4_perception_launch_param_path)"/>
109+
</include>
103110
</group>
104111
<!-- prediction module -->
105112
<group>

0 commit comments

Comments
 (0)