Skip to content

Commit

Permalink
Ros2 v0.8.0 perception launch (autowarefoundation#56)
Browse files Browse the repository at this point in the history
* restore file names

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* update camera lidar fusion arch (autowarefoundation#122)

* Update yolo launch (autowarefoundation#155)

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Revert "restore file names"

This reverts commit 7b50ca1b0067cc29eed73b992dd2bbadc538f4f9.

* fix name

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* fix launch arg

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* fix dependency

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* cosmetic change (autowarefoundation#138)

* cosmetic change

* add image topic

* fix bug

* rename topic names according to ros2 topic name rules

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* [perception_launch] add object_merger as exec_depend

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* [perception launch]: Add missing dependecies for traffic light recognition

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [perception launch]: Fix attributes in arg tag

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [perceptioon_launch] update roi_visualization launch

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [perception_launch]: Fix camera topic name

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [perception_launch]: Fix camera default topic in fusion launch

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

Co-authored-by: Yukihiro Saito <yukky.saito@gmail.com>
Co-authored-by: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com>
Co-authored-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>
Co-authored-by: wep21 <border_goldenmarket@yahoo.co.jp>
  • Loading branch information
5 people authored and 1222-takeshi committed Dec 13, 2021
1 parent 54df374 commit 7573083
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,25 @@
<launch>
<arg name="image_raw0" default="/image_raw"/>
<arg name="camera_info0" default="/camera_info"/>
<arg name="image_raw1" default=""/>
<arg name="camera_info1" default=""/>
<arg name="image_raw2" default=""/>
<arg name="camera_info2" default=""/>
<arg name="image_raw3" default=""/>
<arg name="camera_info3" default=""/>
<arg name="image_raw4" default=""/>
<arg name="camera_info4" default=""/>
<arg name="image_raw5" default=""/>
<arg name="camera_info5" default=""/>
<arg name="image_raw6" default=""/>
<arg name="camera_info6" default=""/>
<arg name="image_raw7" default=""/>
<arg name="camera_info7" default=""/>
<arg name="image_raw1" default="/image_raw1"/>
<arg name="camera_info1" default="/camera_info1"/>
<arg name="image_raw2" default="/image_raw2"/>
<arg name="camera_info2" default="/camera_info2"/>
<arg name="image_raw3" default="/image_raw3"/>
<arg name="camera_info3" default="/camera_info3"/>
<arg name="image_raw4" default="/image_raw4"/>
<arg name="camera_info4" default="/camera_info4"/>
<arg name="image_raw5" default="/image_raw5"/>
<arg name="camera_info5" default="/camera_info5"/>
<arg name="image_raw6" default="/image_raw6"/>
<arg name="camera_info6" default="/camera_info6"/>
<arg name="image_raw7" default="/image_raw7"/>
<arg name="camera_info7" default="/camera_info7"/>
<arg name="image_number" default="1"/>
<arg name="use_vector_map" default="true"/>

<!-- <include file="$(find-pkg-share euclidean_cluster)/launch/euclidean_cluster.launch.xml"/> -->
<!-- or -->
<!-- <include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml" /> -->
<!-- or -->
<include file="$(find-pkg-share lidar_apollo_instance_segmentation)/launch/lidar_apollo_instance_segmentation.launch.xml">
<arg name="output/objects" value="clusters"/>
</include>

<!-- Jetson AGX -->
<!-- <include file="$(find-pkg-share tensorrt_yolo3)/launch/yolo3.launch.xml">
<!-- <include file="$(find-pkg-share tensorrt_yolo)/launch/yolo.launch.xml">
<arg name="image_raw0" value="$(var image_raw0)"/>
<arg name="image_raw1" value="$(var image_raw1)"/>
<arg name="image_raw2" value="$(var image_raw2)"/>
Expand All @@ -41,22 +33,111 @@
<arg name="image_number" value="$(var image_number)"/>
</include> -->

<include file="$(find-pkg-share roi_cluster_fusion)/launch/roi_cluster_fusion.launch.xml">
<arg name="input_camera_info0" value="$(var camera_info0)"/>
<arg name="input_camera_info1" value="$(var camera_info1)"/>
<arg name="input_camera_info2" value="$(var camera_info2)"/>
<arg name="input_camera_info3" value="$(var camera_info3)"/>
<arg name="input_camera_info4" value="$(var camera_info4)"/>
<arg name="input_camera_info5" value="$(var camera_info5)"/>
<arg name="input_camera_info6" value="$(var camera_info6)"/>
<arg name="input_camera_info7" value="$(var camera_info7)"/>
<arg name="input_rois_number" value="$(var image_number)"/>
</include>
<group>
<push-ros-namespace namespace="euclidean"/>
<include file="$(find-pkg-share euclidean_cluster)/launch/voxel_grid_based_euclidean_cluster.launch.xml" >
<arg name="output/clusters" value="lidar/clusters"/>
</include>
<include file="$(find-pkg-share roi_cluster_fusion)/launch/roi_cluster_fusion.launch.xml">
<arg name="input/camera_info0" value="$(var camera_info0)"/>
<arg name="input/rois0" value="/perception/object_recognition/detection/rois0"/>
<arg name="input/camera_info1" value="$(var camera_info1)"/>
<arg name="input/rois1" value="/perception/object_recognition/detection/rois1"/>
<arg name="input/camera_info2" value="$(var camera_info2)"/>
<arg name="input/rois2" value="/perception/object_recognition/detection/rois2"/>
<arg name="input/camera_info3" value="$(var camera_info3)"/>
<arg name="input/rois3" value="/perception/object_recognition/detection/rois3"/>
<arg name="input/camera_info4" value="$(var camera_info4)"/>
<arg name="input/rois4" value="/perception/object_recognition/detection/rois4"/>
<arg name="input/camera_info5" value="$(var camera_info5)"/>
<arg name="input/rois5" value="/perception/object_recognition/detection/rois5"/>
<arg name="input/camera_info6" value="$(var camera_info6)"/>
<arg name="input/rois6" value="/perception/object_recognition/detection/rois6"/>
<arg name="input/camera_info7" value="$(var camera_info7)"/>
<arg name="input/rois7" value="/perception/object_recognition/detection/rois7"/>
<arg name="input/rois_number" value="$(var image_number)"/>
<arg name="input/clusters" value="lidar/clusters"/>
<arg name="input/image0" value="$(var image_raw0)"/>
<arg name="input/image1" value="$(var image_raw1)"/>
<arg name="input/image2" value="$(var image_raw2)"/>
<arg name="input/image3" value="$(var image_raw3)"/>
<arg name="input/image4" value="$(var image_raw4)"/>
<arg name="input/image5" value="$(var image_raw5)"/>
<arg name="input/image6" value="$(var image_raw6)"/>
<arg name="input/image7" value="$(var image_raw7)"/>
<arg name="output" value="camera_lidar_fusion/clusters"/>
</include>
<include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
<arg name="use_map_corrent" value="$(var use_vector_map)"/>
<arg name="input/objects" value="camera_lidar_fusion/clusters" />
<arg name="output/objects" value="camera_lidar_fusion/objects" />
<arg name="orientation_reliable" value="false"/>
</include>
<include file="$(find-pkg-share object_range_splitter)/launch/object_range_splitter.launch.xml">
<arg name="input/object" value="camera_lidar_fusion/objects"/>
<arg name="output/long_range_object" value="camera_lidar_fusion/long_range_objects"/>
<arg name="output/short_range_object" value="camera_lidar_fusion/short_range_objects"/>
<arg name="split_range" value="10.0"/>
</include>
</group>

<!-- <include file="$(find-pkg-share cluster_data_association)/launch/cluster_data_association.launch.xml" /> -->
<group>
<push-ros-namespace namespace="apollo"/>
<include file="$(find-pkg-share lidar_apollo_instance_segmentation)/launch/lidar_apollo_instance_segmentation.launch.xml">
<arg name="output/objects" value="lidar/clusters"/>
</include>
<include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
<arg name="use_map_corrent" value="$(var use_vector_map)"/>
<arg name="input/objects" value="lidar/clusters" />
<arg name="output/objects" value="lidar/objects" />
<arg name="orientation_reliable" value="true"/>
</include>
<include file="$(find-pkg-share object_range_splitter)/launch/object_range_splitter.launch.xml">
<arg name="input/object" value="lidar/objects"/>
<arg name="output/long_range_object" value="lidar/long_range_objects"/>
<arg name="output/short_range_object" value="lidar/short_range_objects"/>
<arg name="split_range" value="15.0"/>
</include>
<include file="$(find-pkg-share roi_cluster_fusion)/launch/roi_cluster_fusion.launch.xml">
<arg name="input/camera_info0" value="$(var camera_info0)"/>
<arg name="input/rois0" value="/perception/object_recognition/detection/rois0"/>
<arg name="input/camera_info1" value="$(var camera_info1)"/>
<arg name="input/rois1" value="/perception/object_recognition/detection/rois1"/>
<arg name="input/camera_info2" value="$(var camera_info2)"/>
<arg name="input/rois2" value="/perception/object_recognition/detection/rois2"/>
<arg name="input/camera_info3" value="$(var camera_info3)"/>
<arg name="input/rois3" value="/perception/object_recognition/detection/rois3"/>
<arg name="input/camera_info4" value="$(var camera_info4)"/>
<arg name="input/rois4" value="/perception/object_recognition/detection/rois4"/>
<arg name="input/camera_info5" value="$(var camera_info5)"/>
<arg name="input/rois5" value="/perception/object_recognition/detection/rois5"/>
<arg name="input/camera_info6" value="$(var camera_info6)"/>
<arg name="input/rois6" value="/perception/object_recognition/detection/rois6"/>
<arg name="input/camera_info7" value="$(var camera_info7)"/>
<arg name="input/rois7" value="/perception/object_recognition/detection/rois7"/>
<arg name="input/rois_number" value="$(var image_number)"/>
<arg name="input/clusters" value="lidar/short_range_objects"/>
<arg name="output" value="camera_lidar_fusion/short_range_objects"/>
<arg name="input/image0" value="$(var image_raw0)"/>
<arg name="input/image1" value="$(var image_raw1)"/>
<arg name="input/image2" value="$(var image_raw2)"/>
<arg name="input/image3" value="$(var image_raw3)"/>
<arg name="input/image4" value="$(var image_raw4)"/>
<arg name="input/image5" value="$(var image_raw5)"/>
<arg name="input/image6" value="$(var image_raw6)"/>
<arg name="input/image7" value="$(var image_raw7)"/>
</include>
<include file="$(find-pkg-share object_merger)/launch/object_association_merger.launch.xml">
<arg name="input/object0" value="camera_lidar_fusion/short_range_objects"/>
<arg name="input/object1" value="lidar/long_range_objects"/>
<arg name="output/object" value="camera_lidar_fusion/objects"/>
</include>
</group>

<include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
<arg name="use_map_corrent" value="$(var use_vector_map)"/>
<arg name="output/objects" value="objects" />
<include file="$(find-pkg-share object_merger)/launch/object_association_merger.launch.xml">
<arg name="input/object0" value="apollo/camera_lidar_fusion/objects"/>
<arg name="input/object1" value="euclidean/camera_lidar_fusion/short_range_objects"/>
<arg name="output/object" value="objects"/>
</include>

</launch>
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
<!-- <include file="$(find-pkg-share dynamic_object_visualization)/launch/dynamic_object_visualizer.launch.xml">
<arg name="input" value="objects"/>
<arg name="with_feature" value="true"/>
<arg name="only_known_objects" default="false"/>
<arg name="only_known_objects" value="false"/>
</include> -->
</launch>
32 changes: 16 additions & 16 deletions launch/perception_launch/launch/perception.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<!-- common parameters -->
<arg name="mode" default="camera_lidar_fusion"/>
<!-- "camera_lidar_fusion", "lidar" or "camera" -->
<arg name="image_raw0" default="/sensing/camera/0/image_raw"/>
<arg name="camera_info0" default="/sensing/camera/0/camera_info"/>
<arg name="image_raw1" default="/sensing/camera/1/image_raw"/>
<arg name="camera_info1" default="/sensing/camera/1/camera_info"/>
<arg name="image_raw2" default="/sensing/camera/2/image_raw"/>
<arg name="camera_info2" default="/sensing/camera/2/camera_info"/>
<arg name="image_raw3" default="/sensing/camera/3/image_raw"/>
<arg name="camera_info3" default="/sensing/camera/3/camera_info"/>
<arg name="image_raw4" default="/sensing/camera/4/image_raw"/>
<arg name="camera_info4" default="/sensing/camera/4/camera_info"/>
<arg name="image_raw5" default="/sensing/camera/5/image_raw"/>
<arg name="camera_info5" default="/sensing/camera/5/camera_info"/>
<arg name="image_raw6" default=""/>
<arg name="camera_info6" default=""/>
<arg name="image_raw7" default=""/>
<arg name="camera_info7" default=""/>
<arg name="image_raw0" default="/sensing/camera/camera0/image_rect_color"/>
<arg name="camera_info0" default="/sensing/camera/camera0/camera_info"/>
<arg name="image_raw1" default="/sensing/camera/camera1/image_rect_color"/>
<arg name="camera_info1" default="/sensing/camera/camera1/camera_info"/>
<arg name="image_raw2" default="/sensing/camera/camera2/image_rect_color"/>
<arg name="camera_info2" default="/sensing/camera/camera2/camera_info"/>
<arg name="image_raw3" default="/sensing/camera/camera3/image_rect_color"/>
<arg name="camera_info3" default="/sensing/camera/camera3/camera_info"/>
<arg name="image_raw4" default="/sensing/camera/camera4/image_rect_color"/>
<arg name="camera_info4" default="/sensing/camera/camera4/camera_info"/>
<arg name="image_raw5" default="/sensing/camera/camera5/image_rect_color"/>
<arg name="camera_info5" default="/sensing/camera/camera5/camera_info"/>
<arg name="image_raw6" default="/sensing/camera/camera6/image_rect_color"/>
<arg name="camera_info6" default="/sensing/camera/camera6/camera_info"/>
<arg name="image_raw7" default="/sensing/camera/camera7/image_rect_color"/>
<arg name="camera_info7" default="/sensing/camera/camera7/camera_info"/>
<arg name="image_number" default="6"/>
<arg name="use_vector_map" default="true"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,11 @@ def create_parameter_dict(*args):
remappings=[('input/image', LaunchConfiguration('input/image')),
('input/rois', 'rois'),
('input/rough/rois', 'rough/rois'),
('input/traffic_light_states', 'traffic_light_states'),
('output/image', 'debug/rois'),
('output/image/compressed', 'debug/rois/compressed'),
('output/image/compressedDepth', 'debug/rois/compressedDepth')]
('output/image/compressedDepth', 'debug/rois/compressedDepth'),
('output/image/theora', 'debug/rois/theora')]
)
],
output='both',
Expand Down
11 changes: 11 additions & 0 deletions launch/perception_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<!-- object recognition -->
<exec_depend>dynamic_object_visualization</exec_depend>
<exec_depend>euclidean_cluster</exec_depend>
<exec_depend>lidar_apollo_instance_segmentation</exec_depend>
Expand All @@ -18,6 +19,16 @@
<exec_depend>naive_path_prediction</exec_depend>
<exec_depend>roi_cluster_fusion</exec_depend>
<exec_depend>shape_estimation</exec_depend>
<exec_depend>tensorrt_yolo</exec_depend>
<exec_depend>object_range_splitter</exec_depend>
<exec_depend>object_merger</exec_depend>

<!-- traffic light recognition -->
<exec_depend>image_transport</exec_depend>
<exec_depend>traffic_light_map_based_detector</exec_depend>
<exec_depend>traffic_light_ssd_fine_detector</exec_depend>
<exec_depend>traffic_light_classifier</exec_depend>
<exec_depend>traffic_light_visualization</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down

0 comments on commit 7573083

Please sign in to comment.