Skip to content

Commit

Permalink
refactor(traffic_light_*)!: add package name prefix of autoware_ (aut…
Browse files Browse the repository at this point in the history
…owarefoundation#8159)

* chore: rename traffic_light_fine_detector to autoware_traffic_light_fine_detector

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>

* chore: rename traffic_light_multi_camera_fusion to autoware_traffic_light_multi_camera_fusion

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>

* chore: rename traffic_light_occlusion_predictor to autoware_traffic_light_occlusion_predictor

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>

* chore: rename traffic_light_classifier to autoware_traffic_light_classifier

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>

* chore: rename traffic_light_map_based_detector to autoware_traffic_light_map_based_detector

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>

* chore: rename traffic_light_visualization to autoware_traffic_light_visualization

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>

---------

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
  • Loading branch information
technolojin authored and chtseng committed Jul 26, 2024
1 parent 3a26d50 commit fdef9ea
Show file tree
Hide file tree
Showing 73 changed files with 71 additions and 67 deletions.
12 changes: 6 additions & 6 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ perception/autoware_simple_object_merger/** satoshi.tanaka@tier4.jp shunsuke.miu
perception/autoware_tensorrt_classifier/** kotaro.uetake@tier4.jp shunsuke.miura@tier4.jp
perception/tensorrt_yolox/** dan.umeda@tier4.jp manato.hirabayashi@tier4.jp
perception/traffic_light_arbiter/** kenzo.lobos@tier4.jp shunsuke.miura@tier4.jp
perception/traffic_light_classifier/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp
perception/traffic_light_fine_detector/** shintaro.tomie@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/traffic_light_map_based_detector/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp
perception/traffic_light_multi_camera_fusion/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/traffic_light_occlusion_predictor/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/traffic_light_visualization/** tao.zhong@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_traffic_light_classifier/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_traffic_light_fine_detector/** shintaro.tomie@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/autoware_traffic_light_map_based_detector/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_traffic_light_multi_camera_fusion/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/autoware_traffic_light_occlusion_predictor/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/autoware_traffic_light_visualization/** tao.zhong@tier4.jp yukihiro.saito@tier4.jp
planning/autoware_costmap_generator/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
planning/autoware_external_velocity_limit_selector/** satoshi.ota@tier4.jp shinnosuke.hirakawa@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
planning/autoware_freespace_planner/** kosuke.takeuchi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<arg name="enable_image_decompressor" default="true" description="enable image decompressor"/>
<arg name="enable_fine_detection" default="true" description="enable fine position adjustment of traffic light"/>
<arg name="fusion_only" default="false" description="launch only occlusion_predictor and multi_camera_fusion"/>
<arg name="traffic_light_fine_detector_model_path" default="$(find-pkg-share traffic_light_fine_detector)/data" description="fine detector label path"/>
<arg name="traffic_light_fine_detector_model_path" default="$(find-pkg-share autoware_traffic_light_fine_detector)/data" description="fine detector label path"/>
<arg name="traffic_light_fine_detector_label_name" default="tlr_labels.txt" description="fine detector label filename"/>
<arg name="traffic_light_fine_detector_model_name" default="tlr_yolox_s_batch_6" description="fine detector onnx model filename"/>
<arg name="traffic_light_classifier_model_path" default="$(find-pkg-share traffic_light_classifier)/data" description="classifier label path"/>
<arg name="traffic_light_classifier_model_path" default="$(find-pkg-share autoware_traffic_light_classifier)/data" description="classifier label path"/>
<arg name="car_traffic_light_classifier_label_name" default="lamp_labels.txt" description="classifier label filename"/>
<arg name="pedestrian_traffic_light_classifier_label_name" default="lamp_labels_ped.txt" description="classifier label filename"/>
<arg name="car_traffic_light_classifier_model_name" default="traffic_light_classifier_mobilenetv2_batch_6.onnx" description="classifier onnx model filename"/>
Expand All @@ -24,9 +24,9 @@
<let name="all_camera_namespaces" value="[$(var namespace1)]" if="$(eval &quot; '$(var image_number)' == '1' &quot;)"/>
<let name="all_camera_namespaces" value="[$(var namespace1), $(var namespace2)]" if="$(eval &quot; '$(var image_number)' >= '2' &quot;)"/>

<arg name="fine_detector_param_path" default="$(find-pkg-share traffic_light_fine_detector)/config/traffic_light_fine_detector.param.yaml"/>
<arg name="car_classifier_param_path" default="$(find-pkg-share traffic_light_classifier)/config/car_traffic_light_classifier.param.yaml"/>
<arg name="pedestrian_classifier_param_path" default="$(find-pkg-share traffic_light_classifier)/config/pedestrian_traffic_light_classifier.param.yaml"/>
<arg name="fine_detector_param_path" default="$(find-pkg-share autoware_traffic_light_fine_detector)/config/traffic_light_fine_detector.param.yaml"/>
<arg name="car_classifier_param_path" default="$(find-pkg-share autoware_traffic_light_classifier)/config/car_traffic_light_classifier.param.yaml"/>
<arg name="pedestrian_classifier_param_path" default="$(find-pkg-share autoware_traffic_light_classifier)/config/pedestrian_traffic_light_classifier.param.yaml"/>

<!-- namespace1 camera TLR pipeline -->
<group>
Expand All @@ -44,7 +44,7 @@
<node pkg="topic_tools" exec="relay" name="traffic_light_camera_info_relay" args="$(var input/camera_info) camera_info"/>
<group>
<push-ros-namespace namespace="detection"/>
<include file="$(find-pkg-share traffic_light_map_based_detector)/launch/traffic_light_map_based_detector.launch.xml">
<include file="$(find-pkg-share autoware_traffic_light_map_based_detector)/launch/traffic_light_map_based_detector.launch.xml">
<arg name="input/camera_info" value="$(var input/camera_info)"/>
<arg name="expect/rois" value="expect/rois"/>
<arg name="output/rois" value="$(var map_based_detector_output_topic)"/>
Expand Down Expand Up @@ -72,7 +72,7 @@

<group>
<push-ros-namespace namespace="classification"/>
<include file="$(find-pkg-share traffic_light_occlusion_predictor)/launch/traffic_light_occlusion_predictor.launch.xml">
<include file="$(find-pkg-share autoware_traffic_light_occlusion_predictor)/launch/traffic_light_occlusion_predictor.launch.xml">
<arg name="input/camera_info" value="$(var input/camera_info)"/>
<arg name="input/cloud" value="$(var input/cloud)"/>
<arg name="input/rois" value="$(var output/rois1)"/>
Expand All @@ -99,7 +99,7 @@
<node pkg="topic_tools" exec="relay" name="traffic_light_camera_info_relay" args="$(var input/camera_info) camera_info"/>
<group>
<push-ros-namespace namespace="detection"/>
<include file="$(find-pkg-share traffic_light_map_based_detector)/launch/traffic_light_map_based_detector.launch.xml">
<include file="$(find-pkg-share autoware_traffic_light_map_based_detector)/launch/traffic_light_map_based_detector.launch.xml">
<arg name="input/camera_info" value="$(var input/camera_info)"/>
<arg name="expect/rois" value="expect/rois"/>
<arg name="output/rois" value="$(var map_based_detector_output_topic)"/>
Expand Down Expand Up @@ -127,7 +127,7 @@

<group>
<push-ros-namespace namespace="classification"/>
<include file="$(find-pkg-share traffic_light_occlusion_predictor)/launch/traffic_light_occlusion_predictor.launch.xml">
<include file="$(find-pkg-share autoware_traffic_light_occlusion_predictor)/launch/traffic_light_occlusion_predictor.launch.xml">
<arg name="input/camera_info" value="$(var input/camera_info)"/>
<arg name="input/cloud" value="$(var input/cloud)"/>
<arg name="input/rois" value="$(var output/rois2)"/>
Expand All @@ -140,7 +140,7 @@

<!-- traffic_light_multi_camera_fusion -->
<group>
<node pkg="traffic_light_multi_camera_fusion" exec="traffic_light_multi_camera_fusion_node" name="traffic_light_multi_camera_fusion" output="screen">
<node pkg="autoware_traffic_light_multi_camera_fusion" exec="traffic_light_multi_camera_fusion_node" name="traffic_light_multi_camera_fusion" output="screen">
<param name="camera_namespaces" value="$(var all_camera_namespaces)"/>
<param name="perform_group_fusion" value="true"/>
<remap from="~/input/vector_map" to="/map/vector_map"/>
Expand Down Expand Up @@ -177,6 +177,6 @@

<!-- visualizer -->
<group>
<include file="$(find-pkg-share traffic_light_visualization)/launch/traffic_light_map_visualizer.launch.xml"/>
<include file="$(find-pkg-share autoware_traffic_light_visualization)/launch/traffic_light_map_visualizer.launch.xml"/>
</group>
</launch>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def create_parameter_dict(*args):
executable=LaunchConfiguration("container_executable"),
composable_node_descriptions=[
ComposableNode(
package="traffic_light_classifier",
package="autoware_traffic_light_classifier",
plugin="autoware::traffic_light::TrafficLightClassifierNodelet",
name="car_traffic_light_classifier",
namespace="classification",
Expand All @@ -70,7 +70,7 @@ def create_parameter_dict(*args):
],
),
ComposableNode(
package="traffic_light_classifier",
package="autoware_traffic_light_classifier",
plugin="autoware::traffic_light::TrafficLightClassifierNodelet",
name="pedestrian_traffic_light_classifier",
namespace="classification",
Expand All @@ -85,7 +85,7 @@ def create_parameter_dict(*args):
],
),
ComposableNode(
package="traffic_light_visualization",
package="autoware_traffic_light_visualization",
plugin="autoware::traffic_light::TrafficLightRoiVisualizerNode",
name="traffic_light_roi_visualizer",
parameters=[create_parameter_dict("enable_fine_detection")],
Expand Down Expand Up @@ -136,7 +136,7 @@ def create_parameter_dict(*args):
fine_detector_loader = LoadComposableNodes(
composable_node_descriptions=[
ComposableNode(
package="traffic_light_fine_detector",
package="autoware_traffic_light_fine_detector",
plugin="autoware::traffic_light::TrafficLightFineDetectorNode",
name="traffic_light_fine_detector",
namespace="detection",
Expand Down Expand Up @@ -168,8 +168,8 @@ def add_launch_arg(name: str, default_value=None, description=None):
DeclareLaunchArgument(name, default_value=default_value, description=description)
)

fine_detector_share_dir = get_package_share_directory("traffic_light_fine_detector")
classifier_share_dir = get_package_share_directory("traffic_light_classifier")
fine_detector_share_dir = get_package_share_directory("autoware_traffic_light_fine_detector")
classifier_share_dir = get_package_share_directory("autoware_traffic_light_classifier")
add_launch_arg("enable_image_decompressor", "True")
add_launch_arg("enable_fine_detection", "True")
add_launch_arg("input/image", "/sensing/camera/traffic_light/image_raw")
Expand Down
12 changes: 6 additions & 6 deletions launch/tier4_perception_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@
<exec_depend>autoware_raindrop_cluster_filter</exec_depend>
<exec_depend>autoware_shape_estimation</exec_depend>
<exec_depend>autoware_tracking_object_merger</exec_depend>
<exec_depend>autoware_traffic_light_classifier</exec_depend>
<exec_depend>autoware_traffic_light_fine_detector</exec_depend>
<exec_depend>autoware_traffic_light_map_based_detector</exec_depend>
<exec_depend>autoware_traffic_light_multi_camera_fusion</exec_depend>
<exec_depend>autoware_traffic_light_occlusion_predictor</exec_depend>
<exec_depend>autoware_traffic_light_visualization</exec_depend>
<exec_depend>elevation_map_loader</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>
<exec_depend>traffic_light_classifier</exec_depend>
<exec_depend>traffic_light_fine_detector</exec_depend>
<exec_depend>traffic_light_map_based_detector</exec_depend>
<exec_depend>traffic_light_multi_camera_fusion</exec_depend>
<exec_depend>traffic_light_occlusion_predictor</exec_depend>
<exec_depend>traffic_light_visualization</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(traffic_light_classifier)
project(autoware_traffic_light_classifier)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<arg name="input/image" default="~/image_raw"/>
<arg name="input/rois" default="~/rois"/>
<arg name="output/traffic_signals" default="classified/traffic_signals"/>
<arg name="traffic_light_classifier_param_path" default="$(find-pkg-share traffic_light_classifier)/config/traffic_light_classifier.param.yaml" description="classifier param path"/>
<arg name="traffic_light_classifier_param_path" default="$(find-pkg-share autoware_traffic_light_classifier)/config/traffic_light_classifier.param.yaml" description="classifier param path"/>
<arg name="build_only" default="false" description="exit after trt engine is built"/>

<node pkg="traffic_light_classifier" exec="traffic_light_classifier_node" name="traffic_light_classifier" output="screen">
<node pkg="autoware_traffic_light_classifier" exec="traffic_light_classifier_node" name="traffic_light_classifier" output="screen">
<remap from="~/input/image" to="$(var input/image)"/>
<remap from="~/input/rois" to="$(var input/rois)"/>
<remap from="~/output/traffic_signals" to="$(var output/traffic_signals)"/>
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>traffic_light_classifier</name>
<name>autoware_traffic_light_classifier</name>
<version>0.1.0</version>
<description>The traffic_light_classifier package</description>
<description>The autoware_traffic_light_classifier package</description>
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
<maintainer email="shunsuke.miura@tier4.jp">Shunsuke Miura</maintainer>
<maintainer email="tao.zhong@tier4.jp">Tao Zhong</maintainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(traffic_light_fine_detector)
project(autoware_traffic_light_fine_detector)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
<arg name="input/rois" default="/traffic_light_map_based_detector/output/rois"/>
<arg name="expect/rois" default="~/expect/rois"/>
<arg name="output/rois" default="~/output/rois"/>
<arg name="traffic_light_fine_detector_param_path" default="$(find-pkg-share traffic_light_fine_detector)/config/traffic_light_fine_detector.param.yaml" description="fine detector param path"/>
<arg
name="traffic_light_fine_detector_param_path"
default="$(find-pkg-share autoware_traffic_light_fine_detector)/config/traffic_light_fine_detector.param.yaml"
description="fine detector param path"
/>
<arg name="build_only" default="false" description="exit after trt engine is built"/>

<node pkg="traffic_light_fine_detector" exec="traffic_light_fine_detector_node" name="traffic_light_fine_detector" output="screen">
<node pkg="autoware_traffic_light_fine_detector" exec="traffic_light_fine_detector_node" name="traffic_light_fine_detector" output="screen">
<remap from="~/input/image" to="$(var input/image)"/>
<remap from="~/input/rois" to="$(var input/rois)"/>
<remap from="~/expect/rois" to="$(var expect/rois)"/>
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>traffic_light_fine_detector</name>
<name>autoware_traffic_light_fine_detector</name>
<version>0.1.0</version>
<description>The traffic_light_fine_detector package</description>
<description>The autoware_traffic_light_fine_detector package</description>
<maintainer email="tao.zhong@tier4.jp">Tao Zhong</maintainer>
<maintainer email="shunsuke.miura@tier4.jp">Shunsuke Miura</maintainer>
<maintainer email="shintaro.tomie@tier4.jp">Shintaro Tomie</maintainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(traffic_light_map_based_detector)
project(autoware_traffic_light_map_based_detector)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# The `traffic_light_map_based_detector` Package
# The `autoware_traffic_light_map_based_detector` Package

## Overview

`traffic_light_map_based_detector` calculates where the traffic lights will appear in the image based on the HD map.
`autoware_traffic_light_map_based_detector` calculates where the traffic lights will appear in the image based on the HD map.

Calibration and vibration errors can be entered as parameters, and the size of the detected RegionOfInterest will change according to the error.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<!--This parameter should be configured differently for each camera considering their delay.-->
<arg name="max_timestamp_offset" default="0.0"/>

<arg name="param_path" default="$(find-pkg-share traffic_light_map_based_detector)/config/traffic_light_map_based_detector.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_traffic_light_map_based_detector)/config/traffic_light_map_based_detector.param.yaml"/>

<node pkg="traffic_light_map_based_detector" exec="traffic_light_map_based_detector_node" name="traffic_light_map_based_detector" output="screen">
<node pkg="autoware_traffic_light_map_based_detector" exec="traffic_light_map_based_detector_node" name="traffic_light_map_based_detector" output="screen">
<remap from="~/input/vector_map" to="$(var input/vector_map)"/>
<remap from="~/input/camera_info" to="$(var input/camera_info)"/>
<remap from="~/expect/rois" to="$(var expect/rois)"/>
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>traffic_light_map_based_detector</name>
<name>autoware_traffic_light_map_based_detector</name>
<version>0.1.0</version>
<description>The traffic_light_map_based_detector package</description>
<description>The autoware_traffic_light_map_based_detector package</description>
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
<maintainer email="shunsuke.miura@tier4.jp">Shunsuke Miura</maintainer>
<maintainer email="tao.zhong@tier4.jp">Tao Zhong</maintainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(traffic_light_multi_camera_fusion)
project(autoware_traffic_light_multi_camera_fusion)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<launch>
<arg name="input/vector_map" default="/map/vector_map"/>
<arg name="param_path" default="$(find-pkg-share traffic_light_multi_camera_fusion)/config/traffic_light_multi_camera_fusion.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_traffic_light_multi_camera_fusion)/config/traffic_light_multi_camera_fusion.param.yaml"/>
<arg name="output/traffic_signals" default="/perception/traffic_light_recognition/traffic_signals"/>

<node pkg="traffic_light_multi_camera_fusion" exec="traffic_light_multi_camera_fusion_node" name="traffic_light_multi_camera_fusion" output="screen">
<node pkg="autoware_traffic_light_multi_camera_fusion" exec="traffic_light_multi_camera_fusion_node" name="traffic_light_multi_camera_fusion" output="screen">
<remap from="~/input/vector_map" to="$(var input/vector_map)"/>
<remap from="~/output/traffic_signals" to="$(var output/traffic_signals)"/>
<param from="$(var param_path)"/>
Expand Down
Loading

0 comments on commit fdef9ea

Please sign in to comment.