Skip to content

Commit

Permalink
refactor(image_projection_based_fusion)!: add package name prefix of …
Browse files Browse the repository at this point in the history
…autoware_ (autowarefoundation#8162)

refactor: rename image_projection_based_fusion to autoware_image_projection_based_fusion

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
  • Loading branch information
technolojin authored and chtseng committed Jul 26, 2024
1 parent 61d9d06 commit 34de179
Show file tree
Hide file tree
Showing 70 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ perception/autoware_detection_by_tracker/** taekjin.lee@tier4.jp yoshi.ri@tier4.
perception/elevation_map_loader/** kosuke.takeuchi@tier4.jp shintaro.tomie@tier4.jp taichi.higashide@tier4.jp
perception/autoware_euclidean_cluster/** dai.nguyen@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_ground_segmentation/** abrahammonrroy@yahoo.com dai.nguyen@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/image_projection_based_fusion/** dai.nguyen@tier4.jp koji.minoda@tier4.jp kotaro.uetake@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_image_projection_based_fusion/** dai.nguyen@tier4.jp koji.minoda@tier4.jp kotaro.uetake@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/lidar_apollo_instance_segmentation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/lidar_apollo_segmentation_tvm/** ambroise.vincent@arm.com yoshi.ri@tier4.jp
perception/lidar_apollo_segmentation_tvm_nodes/** ambroise.vincent@arm.com yoshi.ri@tier4.jp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<!-- PointPainting -->
<group if="$(eval &quot;'$(var lidar_detection_model)'=='pointpainting'&quot;)">
<push-ros-namespace namespace="pointpainting"/>
<include file="$(find-pkg-share image_projection_based_fusion)/launch/pointpainting_fusion.launch.xml">
<include file="$(find-pkg-share autoware_image_projection_based_fusion)/launch/pointpainting_fusion.launch.xml">
<arg name="input/rois_number" value="$(var number_of_cameras)"/>
<arg name="input/rois0" value="$(var input/camera0/rois)"/>
<arg name="input/rois1" value="$(var input/camera1/rois)"/>
Expand Down Expand Up @@ -98,7 +98,7 @@

<!-- Image_segmentation based filter, apply for camera0 only-->
<group>
<include file="$(find-pkg-share image_projection_based_fusion)/launch/segmentation_pointcloud_fusion.launch.xml" if="$(var use_image_segmentation_based_filter)">
<include file="$(find-pkg-share autoware_image_projection_based_fusion)/launch/segmentation_pointcloud_fusion.launch.xml" if="$(var use_image_segmentation_based_filter)">
<arg name="input/pointcloud" value="$(var input/pointcloud_map/pointcloud)"/>
<arg name="output/pointcloud" value="/perception/object_recognition/detection/segmentation_based_filtered/pointcloud"/>
</include>
Expand All @@ -123,7 +123,7 @@
<group>
<push-ros-namespace namespace="roi_cluster"/>
<group>
<include file="$(find-pkg-share image_projection_based_fusion)/launch/roi_pointcloud_fusion.launch.xml" if="$(var use_roi_based_cluster)">
<include file="$(find-pkg-share autoware_image_projection_based_fusion)/launch/roi_pointcloud_fusion.launch.xml" if="$(var use_roi_based_cluster)">
<arg name="input/rois_number" value="$(var number_of_cameras)"/>
<arg name="input/rois0" value="$(var input/camera0/rois)"/>
<arg name="input/rois1" value="$(var input/camera1/rois)"/>
Expand Down Expand Up @@ -179,7 +179,7 @@

<!-- euclidean clustering -->
<group>
<include file="$(find-pkg-share image_projection_based_fusion)/launch/roi_cluster_fusion.launch.xml">
<include file="$(find-pkg-share autoware_image_projection_based_fusion)/launch/roi_cluster_fusion.launch.xml">
<arg name="input/rois_number" value="$(var number_of_cameras)"/>
<arg name="input/rois0" value="$(var input/camera0/rois)"/>
<arg name="input/rois1" value="$(var input/camera1/rois)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

<!-- Camera ROI fusion -->
<group>
<include file="$(find-pkg-share image_projection_based_fusion)/launch/roi_detected_object_fusion.launch.xml">
<include file="$(find-pkg-share autoware_image_projection_based_fusion)/launch/roi_detected_object_fusion.launch.xml">
<arg name="input/rois_number" value="$(var number_of_cameras)"/>
<arg name="input/rois0" value="$(var input/camera0/rois)"/>
<arg name="input/rois1" value="$(var input/camera1/rois)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

<!-- Camera ROI fusion -->
<group>
<include file="$(find-pkg-share image_projection_based_fusion)/launch/roi_detected_object_fusion.launch.xml">
<include file="$(find-pkg-share autoware_image_projection_based_fusion)/launch/roi_detected_object_fusion.launch.xml">
<arg name="input/rois_number" value="$(var number_of_cameras)"/>
<arg name="input/rois0" value="$(var input/camera0/rois)"/>
<arg name="input/rois1" value="$(var input/camera1/rois)"/>
Expand Down
2 changes: 1 addition & 1 deletion launch/tier4_perception_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<exec_depend>autoware_detection_by_tracker</exec_depend>
<exec_depend>autoware_euclidean_cluster</exec_depend>
<exec_depend>autoware_ground_segmentation</exec_depend>
<exec_depend>autoware_image_projection_based_fusion</exec_depend>
<exec_depend>autoware_map_based_prediction</exec_depend>
<exec_depend>autoware_multi_object_tracker</exec_depend>
<exec_depend>autoware_object_merger</exec_depend>
Expand All @@ -35,7 +36,6 @@
<exec_depend>autoware_shape_estimation</exec_depend>
<exec_depend>autoware_tracking_object_merger</exec_depend>
<exec_depend>elevation_map_loader</exec_depend>
<exec_depend>image_projection_based_fusion</exec_depend>
<exec_depend>image_transport_decompressor</exec_depend>
<exec_depend>lidar_apollo_instance_segmentation</exec_depend>
<exec_depend>occupancy_grid_map_outlier_filter</exec_depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(image_projection_based_fusion)
project(autoware_image_projection_based_fusion)
# add_compile_options(-Wno-unknown-pragmas)
add_compile_options(-Wno-unknown-pragmas -fopenmp)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# image_projection_based_fusion
# autoware_image_projection_based_fusion

## Purpose

The `image_projection_based_fusion` is a package to fuse detected obstacles (bounding box or segmentation) from image and 3d pointcloud or obstacles (bounding box, cluster or segmentation).
The `autoware_image_projection_based_fusion` is a package to fuse detected obstacles (bounding box or segmentation) from image and 3d pointcloud or obstacles (bounding box, cluster or segmentation).

## Inner-workings / Algorithms

Expand Down Expand Up @@ -59,7 +59,7 @@ The `pointpainting_fusion` node has `build_only` option to build the TensorRT en
Although it is preferred to move all the ROS parameters in `.param.yaml` file in Autoware Universe, the `build_only` option is not moved to the `.param.yaml` file for now, because it may be used as a flag to execute the build as a pre-task. You can execute with the following command:

```bash
ros2 launch image_projection_based_fusion pointpainting_fusion.launch.xml model_name:=pointpainting model_path:=/home/autoware/autoware_data/image_projection_based_fusion model_param_path:=$(ros2 pkg prefix image_projection_based_fusion --share)/config/pointpainting.param.yaml build_only:=true
ros2 launch autoware_image_projection_based_fusion pointpainting_fusion.launch.xml model_name:=pointpainting model_path:=/home/autoware/autoware_data/image_projection_based_fusion model_param_path:=$(ros2 pkg prefix autoware_image_projection_based_fusion --share)/config/pointpainting.param.yaml build_only:=true
```

#### Known Limits
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The node `segmentation_pointcloud_fusion` is a package for filtering pointcloud

### Core Parameters

{{ json_to_markdown("perception/image_projection_based_fusion/schema/segmentation_pointcloud_fusion.schema.json") }}
{{ json_to_markdown("perception/autoware_image_projection_based_fusion/schema/segmentation_pointcloud_fusion.schema.json") }}

## Assumptions / Known limits

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<arg name="data_path" default="$(env HOME)/autoware_data" description="packages data and artifacts directory path"/>
<arg name="model_name" default="pointpainting" description="options: `pointpainting`"/>
<arg name="model_path" default="$(var data_path)/image_projection_based_fusion"/>
<arg name="model_param_path" default="$(find-pkg-share image_projection_based_fusion)/config/pointpainting.param.yaml"/>
<arg name="model_param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/pointpainting.param.yaml"/>
<arg name="ml_package_param_path" default="$(var model_path)/$(var model_name)_ml_package.param.yaml"/>
<arg name="class_remapper_param_path" default="$(var model_path)/detection_class_remapper.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share image_projection_based_fusion)/config/fusion_common.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/fusion_common.param.yaml"/>
<arg name="build_only" default="false" description="shutdown node after TensorRT engine file is built"/>

<arg name="use_pointcloud_container" default="false" description="use pointcloud_container"/>
Expand All @@ -45,7 +45,7 @@

<group if="$(var use_pointcloud_container)">
<load_composable_node target="$(var pointcloud_container_name)">
<composable_node pkg="image_projection_based_fusion" plugin="autoware::image_projection_based_fusion::PointPaintingFusionNode" name="pointpainting">
<composable_node pkg="autoware_image_projection_based_fusion" plugin="autoware::image_projection_based_fusion::PointPaintingFusionNode" name="pointpainting">
<remap from="~/input/pointcloud" to="$(var input/pointcloud)"/>
<remap from="~/output/objects" to="$(var output/objects)"/>
<param from="$(var model_param_path)" allow_substs="true"/>
Expand Down Expand Up @@ -87,7 +87,7 @@
</load_composable_node>
</group>
<group unless="$(var use_pointcloud_container)">
<node pkg="image_projection_based_fusion" exec="pointpainting_fusion_node" name="pointpainting" output="screen">
<node pkg="autoware_image_projection_based_fusion" exec="pointpainting_fusion_node" name="pointpainting" output="screen">
<remap from="~/input/pointcloud" to="$(var input/pointcloud)"/>
<remap from="~/output/objects" to="$(var output/objects)"/>
<param from="$(var model_param_path)" allow_substs="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<arg name="input/camera_info7" default="/camera_info7"/>
<arg name="input/clusters" default="clusters"/>
<arg name="output/clusters" default="labeled_clusters"/>
<arg name="param_path" default="$(find-pkg-share image_projection_based_fusion)/config/roi_cluster_fusion.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share image_projection_based_fusion)/config/fusion_common.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/roi_cluster_fusion.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/fusion_common.param.yaml"/>

<!-- debug -->
<arg name="input/image0" default="/image_raw0"/>
Expand All @@ -31,7 +31,7 @@
<arg name="input/image6" default="/image_raw6"/>
<arg name="input/image7" default="/image_raw7"/>
<group>
<node pkg="image_projection_based_fusion" exec="roi_cluster_fusion_node" name="roi_cluster_fusion" output="screen">
<node pkg="autoware_image_projection_based_fusion" exec="roi_cluster_fusion_node" name="roi_cluster_fusion" output="screen">
<param name="rois_number" value="$(var input/rois_number)"/>
<param from="$(var param_path)"/>
<param from="$(var sync_param_path)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<arg name="input/camera_info7" default="/camera_info7"/>
<arg name="input/objects" default="objects"/>
<arg name="output/objects" default="fused_objects"/>
<arg name="param_path" default="$(find-pkg-share image_projection_based_fusion)/config/roi_detected_object_fusion.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share image_projection_based_fusion)/config/fusion_common.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/roi_detected_object_fusion.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/fusion_common.param.yaml"/>

<!-- for eval variable-->
<arg name="input_rois_number" default="$(var input/rois_number)"/>
Expand All @@ -35,7 +35,7 @@
<arg name="input/image7" default="/image_raw7"/>

<group>
<node pkg="image_projection_based_fusion" exec="roi_detected_object_fusion_node" name="roi_detected_object_fusion" output="screen">
<node pkg="autoware_image_projection_based_fusion" exec="roi_detected_object_fusion_node" name="roi_detected_object_fusion" output="screen">
<param name="rois_number" value="$(var input/rois_number)"/>
<param from="$(var sync_param_path)"/>
<param from="$(var param_path)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<arg name="output/pointcloud" default="roi_pointcloud_fusion/output/pointcloud"/>
<arg name="output_clusters" default="output_clusters"/>
<arg name="debug/clusters" default="roi_pointcloud_fusion/debug/clusters"/>
<arg name="param_path" default="$(find-pkg-share image_projection_based_fusion)/config/roi_pointcloud_fusion.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share image_projection_based_fusion)/config/fusion_common.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/roi_pointcloud_fusion.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/fusion_common.param.yaml"/>

<!-- for eval variable-->
<arg name="input_rois_number" default="$(var input/rois_number)"/>
Expand All @@ -34,7 +34,7 @@
<arg name="input/image6" default="/image_raw6"/>
<arg name="input/image7" default="/image_raw7"/>
<group>
<node pkg="image_projection_based_fusion" exec="roi_pointcloud_fusion_node" name="roi_pointcloud_fusion" output="screen">
<node pkg="autoware_image_projection_based_fusion" exec="roi_pointcloud_fusion_node" name="roi_pointcloud_fusion" output="screen">
<param name="rois_number" value="$(var input/rois_number)"/>
<param from="$(var param_path)"/>
<param from="$(var sync_param_path)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<arg name="input/camera_info7" default="/sensing/camera/camera0/camera_info"/>
<arg name="input/pointcloud" default="/sensing/lidar/top/outlier_filtered/pointcloud"/>
<arg name="output/pointcloud" default="output/pointcloud"/>
<arg name="sync_param_path" default="$(find-pkg-share image_projection_based_fusion)/config/fusion_common.param.yaml"/>
<arg name="semantic_segmentation_based_filter_param_path" default="$(find-pkg-share image_projection_based_fusion)/config/segmentation_pointcloud_fusion.param.yaml"/>
<arg name="sync_param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/fusion_common.param.yaml"/>
<arg name="semantic_segmentation_based_filter_param_path" default="$(find-pkg-share autoware_image_projection_based_fusion)/config/segmentation_pointcloud_fusion.param.yaml"/>
<arg name="input/image0" default="/image_raw0"/>
<arg name="input/image1" default="/image_raw1"/>
<arg name="input/image2" default="/image_raw2"/>
Expand All @@ -29,7 +29,7 @@
<arg name="input/image6" default="/image_raw6"/>
<arg name="input/image7" default="/image_raw7"/>
<group>
<node pkg="image_projection_based_fusion" exec="segmentation_pointcloud_fusion_node" name="segmentation_pointcloud_fusion" output="screen">
<node pkg="autoware_image_projection_based_fusion" exec="segmentation_pointcloud_fusion_node" name="segmentation_pointcloud_fusion" output="screen">
<param name="rois_number" value="$(var input/camera_number)"/>
<param from="$(var semantic_segmentation_based_filter_param_path)"/>
<param from="$(var sync_param_path)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>image_projection_based_fusion</name>
<name>autoware_image_projection_based_fusion</name>
<version>0.1.0</version>
<description>The image_projection_based_fusion package</description>
<description>The autoware_image_projection_based_fusion package</description>
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
<maintainer email="shunsuke.miura@tier4.jp">Shunsuke Miura</maintainer>
<maintainer email="yoshi.ri@tier4.jp">Yoshi Ri</maintainer>
Expand Down

0 comments on commit 34de179

Please sign in to comment.