Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(probabilistic_occupancy_grid_map, occupancy_grid_map_outlier_filter): add autoware_ prefix to package name #8183

Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ perception/autoware_ground_segmentation/** abrahammonrroy@yahoo.com dai.nguyen@t
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/autoware_lidar_apollo_instance_segmentation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_lidar_centerpoint/** kenzo.lobos@tier4.jp koji.minoda@tier4.jp
perception/occupancy_grid_map_outlier_filter/** abrahammonrroy@yahoo.com yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/probabilistic_occupancy_grid_map/** mamoru.sobue@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_occupancy_grid_map_outlier_filter/** abrahammonrroy@yahoo.com yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_radar_tracks_msgs_converter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
perception/autoware_probabilistic_occupancy_grid_map/** mamoru.sobue@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_raindrop_cluster_filter/** dai.nguyen@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_shape_estimation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_simple_object_merger/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def create_time_series_outlier_filter_components(input_topic, output_topic):
components = []
components.append(
ComposableNode(
package="occupancy_grid_map_outlier_filter",
package="autoware_occupancy_grid_map_outlier_filter",
plugin="autoware::occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent",
name="occupancy_grid_based_outlier_filter",
remappings=[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<!--pointcloud based method-->
<group if="$(eval &quot;'$(var occupancy_grid_map_method)'=='pointcloud_based_occupancy_grid_map'&quot;)">
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/pointcloud_based_occupancy_grid_map.launch.py">
<include file="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/launch/pointcloud_based_occupancy_grid_map.launch.py">
<arg name="input/obstacle_pointcloud" value="$(var input/obstacle_pointcloud)"/>
<arg name="input/raw_pointcloud" value="$(var input/raw_pointcloud)"/>
<arg name="output" value="$(var output)"/>
Expand All @@ -32,7 +32,7 @@

<!--laserscan based method-->
<group if="$(eval &quot;'$(var occupancy_grid_map_method)'=='laserscan_based_occupancy_grid_map'&quot;)">
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/laserscan_based_occupancy_grid_map.launch.py">
<include file="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/launch/laserscan_based_occupancy_grid_map.launch.py">
<arg name="input/obstacle_pointcloud" value="$(var input/obstacle_pointcloud)"/>
<arg name="input/raw_pointcloud" value="$(var input/raw_pointcloud)"/>
<arg name="output" value="$(var output)"/>
Expand All @@ -50,7 +50,7 @@

<!--multi lidar pointclouds based method-->
<group if="$(eval &quot;'$(var occupancy_grid_map_method)'=='multi_lidar_pointcloud_based_occupancy_grid_map'&quot;)">
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py">
<include file="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py">
<arg name="input/obstacle_pointcloud" value="$(var input/obstacle_pointcloud)"/>
<arg name="output" value="/perception/occupancy_grid_map/map"/>
<arg name="use_intra_process" value="true"/>
Expand Down
4 changes: 2 additions & 2 deletions launch/tier4_perception_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
<exec_depend>autoware_object_merger</exec_depend>
<exec_depend>autoware_object_range_splitter</exec_depend>
<exec_depend>autoware_object_velocity_splitter</exec_depend>
<exec_depend>autoware_occupancy_grid_map_outlier_filter</exec_depend>
<exec_depend>autoware_pointcloud_preprocessor</exec_depend>
<exec_depend>autoware_probabilistic_occupancy_grid_map</exec_depend>
<exec_depend>autoware_radar_crossing_objects_noise_filter</exec_depend>
<exec_depend>autoware_radar_fusion_to_detected_object</exec_depend>
<exec_depend>autoware_radar_object_clustering</exec_depend>
Expand All @@ -38,9 +40,7 @@
<exec_depend>autoware_shape_estimation</exec_depend>
<exec_depend>autoware_tracking_object_merger</exec_depend>
<exec_depend>image_transport_decompressor</exec_depend>
<exec_depend>occupancy_grid_map_outlier_filter</exec_depend>
<exec_depend>pointcloud_to_laserscan</exec_depend>
<exec_depend>probabilistic_occupancy_grid_map</exec_depend>
<exec_depend>topic_tools</exec_depend>
<exec_depend>traffic_light_arbiter</exec_depend>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

<arg name="input/laserscan" default="/perception/occupancy_grid_map/virtual_scan/laserscan"/>
<arg name="input/occupancy_grid_map" default="/perception/object_recognition/detection/validation/occupancy_grid_based/single_frame_occupancy_grid_map"/>
<arg name="occupancy_grid_map_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/laserscan_based_occupancy_grid_map.param.yaml"/>
<arg name="occupancy_grid_map_updater_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/binary_bayes_filter_updater.param.yaml"/>
<arg name="occupancy_grid_map_param_path" default="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/laserscan_based_occupancy_grid_map.param.yaml"/>
<arg name="occupancy_grid_map_updater_param_path" default="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/binary_bayes_filter_updater.param.yaml"/>
<arg name="occupancy_grid_based_validator_param_path" default="$(find-pkg-share autoware_detected_object_validation)/config/occupancy_grid_based_validator_param_path.param.yaml"/>

<node pkg="probabilistic_occupancy_grid_map" exec="laserscan_based_occupancy_grid_map_node" name="single_frame_laserscan_occupancy_grid_map" output="screen">
<node pkg="autoware_probabilistic_occupancy_grid_map" exec="laserscan_based_occupancy_grid_map_node" name="single_frame_laserscan_occupancy_grid_map" output="screen">
<remap from="~/input/laserscan" to="$(var input/laserscan)"/>
<remap from="~/output/occupancy_grid_map" to="$(var input/occupancy_grid_map)"/>
<param name="input_obstacle_pointcloud" value="false"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(probabilistic_occupancy_grid_map)
project(autoware_probabilistic_occupancy_grid_map)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# probabilistic_occupancy_grid_map
# autoware_probabilistic_occupancy_grid_map

## Purpose

Expand All @@ -21,12 +21,12 @@ You may need to choose `scan_origin_frame` and `gridmap_origin_frame` which mean

### Parameters

{{ json_to_markdown("perception/probabilistic_occupancy_grid_map/schema/binary_bayes_filter_updater.schema.json") }}
{{ json_to_markdown("perception/probabilistic_occupancy_grid_map/schema/grid_map.schema.json") }}
{{ json_to_markdown("perception/probabilistic_occupancy_grid_map/schema/laserscan_based_occupancy_grid_map.schema.json") }}
{{ json_to_markdown("perception/probabilistic_occupancy_grid_map/schema/multi_lidar_pointcloud_based_occupancy_grid_map.schema.json") }}
{{ json_to_markdown("perception/probabilistic_occupancy_grid_map/schema/pointcloud_based_occupancy_grid_map.schema.json") }}
{{ json_to_markdown("perception/probabilistic_occupancy_grid_map/schema/synchronized_grid_map_fusion_node.schema.json") }}
{{ json_to_markdown("perception/autoware_probabilistic_occupancy_grid_map/schema/binary_bayes_filter_updater.schema.json") }}
{{ json_to_markdown("perception/autoware_probabilistic_occupancy_grid_map/schema/grid_map.schema.json") }}
{{ json_to_markdown("perception/autoware_probabilistic_occupancy_grid_map/schema/laserscan_based_occupancy_grid_map.schema.json") }}
{{ json_to_markdown("perception/autoware_probabilistic_occupancy_grid_map/schema/multi_lidar_pointcloud_based_occupancy_grid_map.schema.json") }}
{{ json_to_markdown("perception/autoware_probabilistic_occupancy_grid_map/schema/pointcloud_based_occupancy_grid_map.schema.json") }}
{{ json_to_markdown("perception/autoware_probabilistic_occupancy_grid_map/schema/synchronized_grid_map_fusion_node.schema.json") }}

### Downsample input pointcloud(Optional)

Expand Down Expand Up @@ -54,7 +54,7 @@ This package provides unit tests using `gtest`.
You can run the test by the following command.

```bash
colcon test --packages-select probabilistic_occupancy_grid_map --event-handlers console_direct+
colcon test --packages-select autoware_probabilistic_occupancy_grid_map --event-handlers console_direct+
```

Test contains the following.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<group>
<push-ros-namespace namespace="/perception/occupancy_grid_map/"/>
<node name="grid_map_visualization" pkg="grid_map_visualization" exec="grid_map_visualization">
<param from="$(find-pkg-share probabilistic_occupancy_grid_map)/config/grid_map_param.yaml"/>
<param from="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/grid_map_param.yaml"/>
</node>
</group>
</launch>
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def launch_setup(context, *args, **kwargs):
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
),
ComposableNode(
package="probabilistic_occupancy_grid_map",
package="autoware_probabilistic_occupancy_grid_map",
plugin="autoware::occupancy_grid_map::LaserscanBasedOccupancyGridMapNode",
name="occupancy_grid_map_node",
remappings=[
Expand Down Expand Up @@ -162,13 +162,13 @@ def add_launch_arg(name: str, default_value=None):
add_launch_arg("output/stixel", "virtual_scan/stixel"),
add_launch_arg(
"param_file",
get_package_share_directory("probabilistic_occupancy_grid_map")
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
+ "/config/laserscan_based_occupancy_grid_map.param.yaml",
),
add_launch_arg("updater_type", "binary_bayes_filter"),
add_launch_arg(
"updater_param_file",
get_package_share_directory("probabilistic_occupancy_grid_map")
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
+ "/config/updater.param.yaml",
),
add_launch_arg("input_obstacle_pointcloud", "false"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def launch_setup(context, *args, **kwargs):

# generate composable node
node = ComposableNode(
package="probabilistic_occupancy_grid_map",
package="autoware_probabilistic_occupancy_grid_map",
plugin="autoware::occupancy_grid_map::PointcloudBasedOccupancyGridMapNode",
name="occupancy_grid_map_node",
namespace=frame_name,
Expand All @@ -218,7 +218,7 @@ def launch_setup(context, *args, **kwargs):
# 2. launch occupancy grid map fusion node
gridmap_fusion_node = [
ComposableNode(
package="probabilistic_occupancy_grid_map",
package="autoware_probabilistic_occupancy_grid_map",
plugin="synchronized_grid_map_fusion::GridMapFusionNode",
name="occupancy_grid_map_fusion_node",
remappings=[
Expand Down Expand Up @@ -275,13 +275,13 @@ def add_launch_arg(name: str, default_value=None):
add_launch_arg("output", "occupancy_grid"),
add_launch_arg(
"multi_lidar_fusion_config_file",
get_package_share_directory("probabilistic_occupancy_grid_map")
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
+ "/config/multi_lidar_pointcloud_based_occupancy_grid_map.param.yaml",
),
add_launch_arg("updater_type", "binary_bayes_filter"),
add_launch_arg(
"updater_param_file",
get_package_share_directory("probabilistic_occupancy_grid_map")
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
+ "/config/binary_bayes_filter_updater.param.yaml",
),
set_container_executable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def launch_setup(context, *args, **kwargs):

composable_nodes.append(
ComposableNode(
package="probabilistic_occupancy_grid_map",
package="autoware_probabilistic_occupancy_grid_map",
plugin="autoware::occupancy_grid_map::PointcloudBasedOccupancyGridMapNode",
name="occupancy_grid_map_node",
remappings=[
Expand Down Expand Up @@ -173,13 +173,13 @@ def add_launch_arg(name: str, default_value=None):
add_launch_arg("output", "occupancy_grid"),
add_launch_arg(
"param_file",
get_package_share_directory("probabilistic_occupancy_grid_map")
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
+ "/config/pointcloud_based_occupancy_grid_map.param.yaml",
),
add_launch_arg("updater_type", "binary_bayes_filter"),
add_launch_arg(
"updater_param_file",
get_package_share_directory("probabilistic_occupancy_grid_map")
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
+ "/config/binary_bayes_filter_updater.param.yaml",
),
set_container_executable,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<launch>
<arg name="output_topic" default="~/output/occupancy_grid_map"/>
<arg name="fusion_node_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/synchronized_grid_map_fusion_node.param.yaml"/>
<arg name="fusion_node_param_path" default="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/synchronized_grid_map_fusion_node.param.yaml"/>

<node name="synchronized_grid_map_fusion_node" exec="synchronized_grid_map_fusion_node" pkg="probabilistic_occupancy_grid_map" output="screen">
<node name="synchronized_grid_map_fusion_node" exec="synchronized_grid_map_fusion_node" pkg="autoware_probabilistic_occupancy_grid_map" output="screen">
<remap from="~/output/occupancy_grid_map" to="$(var output_topic)"/>
<param from="$(var fusion_node_param_path)"/>
</node>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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>probabilistic_occupancy_grid_map</name>
<name>autoware_probabilistic_occupancy_grid_map</name>
<version>0.1.0</version>
<description>generate probabilistic occupancy grid map</description>
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ In several places we have modified the external code written in BSD3 license.
If `grid_map_type` is "OccupancyGridMapProjectiveBlindSpot" and `pub_debug_grid` is `true`, it is possible to check the each process of grid map generation by running

```shell
ros2 launch probabilistic_occupancy_grid_map debug.launch.xml
ros2 launch autoware_probabilistic_occupancy_grid_map debug.launch.xml
```

and visualizing the following occupancy grid map topics (which are listed in config/grid_map_param.yaml):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ The minimum node launch will be like the following.
<?xml version="1.0"?>
<launch>
<arg name="output_topic" default="~/output/occupancy_grid_map"/>
<arg name="fusion_node_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/synchronized_grid_map_fusion_node.param.yaml"/>
<arg name="fusion_node_param_path" default="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/synchronized_grid_map_fusion_node.param.yaml"/>

<node name="synchronized_grid_map_fusion_node" exec="synchronized_grid_map_fusion_node" pkg="probabilistic_occupancy_grid_map" output="screen">
<node name="synchronized_grid_map_fusion_node" exec="synchronized_grid_map_fusion_node" pkg="autoware_probabilistic_occupancy_grid_map" output="screen">
<remap from="~/output/occupancy_grid_map" to="$(var output_topic)"/>
<param from="$(var fusion_node_param_path)"/>
</node>
Expand All @@ -90,7 +90,7 @@ The minimum node launch will be like the following.

You need to generate OGMs in each sensor frame before achieving grid map fusion.

`probabilistic_occupancy_grid_map` package supports to generate OGMs for the each from the point cloud data.
`autoware_probabilistic_occupancy_grid_map` package supports to generate OGMs for the each from the point cloud data.

<details>
<summary> Example launch.xml (click to expand) </summary>
Expand All @@ -107,7 +107,7 @@ You need to generate OGMs in each sensor frame before achieving grid map fusion.
<arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
<arg name="pointcloud_container_name" value="$(var pointcloud_container_name)"/>
<arg name="method" value="pointcloud_based_occupancy_grid_map"/>
<arg name="param_file" value="$(find-pkg-share probabilistic_occupancy_grid_map)/config/pointcloud_based_occupancy_grid_map_fusion.param.yaml"/>
<arg name="param_file" value="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/pointcloud_based_occupancy_grid_map_fusion.param.yaml"/>
</include>


Expand All @@ -130,7 +130,7 @@ The minimum parameter for the OGM generation in each frame is shown in the follo
<br>

We recommend to use same `map_frame`, size and resolutions for the OGMs from synchronized sensors.
Also, remember to set `enable_single_frame_mode` and `filter_obstacle_pointcloud_by_raw_pointcloud` to `true` in the `probabilistic_occupancy_grid_map` package (you do not need to set these parameters if you use the above example config file).
Also, remember to set `enable_single_frame_mode` and `filter_obstacle_pointcloud_by_raw_pointcloud` to `true` in the `autoware_probabilistic_occupancy_grid_map` package (you do not need to set these parameters if you use the above example config file).

<br>

Expand All @@ -141,7 +141,7 @@ We prepared the launch file to run both OGM generation node and fusion node in [
You can include this launch file like the following.

```xml
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/grid_map_fusion_with_synchronized_pointclouds.launch.py">
<include file="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/launch/grid_map_fusion_with_synchronized_pointclouds.launch.py">
<arg name="output" value="/perception/occupancy_grid_map/fusion/map"/>
<arg name="use_intra_process" value="true"/>
<arg name="use_multithread" value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from sensor_msgs.msg import PointField
from tf2_ros.static_transform_broadcaster import StaticTransformBroadcaster

PACKAGE_NAME = "probabilistic_occupancy_grid_map"
PACKAGE_NAME = "autoware_probabilistic_occupancy_grid_map"
INPUT_TOPIC_RAW = "/raw"
INPUT_TOPIC_OBSTACLE = "/obstacle"

Expand Down
4 changes: 2 additions & 2 deletions perception/occupancy_grid_map_outlier_filter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(occupancy_grid_map_outlier_filter)
project(autoware_occupancy_grid_map_outlier_filter)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down Expand Up @@ -41,6 +41,6 @@ endif()
# -- Occupancy Grid Map Outlier Filter --
rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent"
EXECUTABLE occupancy_grid_map_outlier_filter_node)
EXECUTABLE ${PROJECT_NAME}_node)

ament_auto_package(INSTALL_TO_SHARE)
2 changes: 1 addition & 1 deletion perception/occupancy_grid_map_outlier_filter/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# occupancy_grid_map_outlier_filter
# autoware_occupancy_grid_map_outlier_filter

## Purpose

Expand Down
Loading
Loading