refactor: image transport decompressor/autoware prefix (autowarefound…

…ation#8197) * refactor: add `autoware` namespace prefix to image_transport_decompressor Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * refactor(image_transport_decompressor): add `autoware` prefix to the package code Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * refactor: update package name in CODEOWNER Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * fix: merge main into the branch Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * refactor: update packages which depend on image_transport_decompressor Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * refactor(image_transport_decompressor): update README Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> * style(pre-commit): autofix --------- Signed-off-by: Manato HIRABAYASHI <manato.hirabayashi@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Taekjin LEE <taekjin.lee@tier4.jp>
esteve · Aug 13, 2024 · 6d2fb1d · 6d2fb1d
1 parent 85df932
commit 6d2fb1d
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 29 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -201,7 +201,7 @@ planning/sampling_based_planner/autoware_path_sampler/** maxime.clement@tier4.jp
 planning/sampling_based_planner/autoware_sampler_common/** maxime.clement@tier4.jp
 sensing/gnss_poser/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp
 sensing/autoware_image_diagnostics/** dai.nguyen@tier4.jp yoshi.ri@tier4.jp
-sensing/image_transport_decompressor/** kenzo.lobos@tier4.jp yukihiro.saito@tier4.jp
+sensing/autoware_image_transport_decompressor/** kenzo.lobos@tier4.jp yukihiro.saito@tier4.jp
 sensing/imu_corrector/** taiki.yamada@tier4.jp yamato.ando@tier4.jp
 sensing/livox/autoware_livox_tag_filter/** kenzo.lobos@tier4.jp ryohsuke.mitsudome@tier4.jp
 sensing/autoware_pointcloud_preprocessor/** abrahammonrroy@yahoo.com dai.nguyen@tier4.jp david.wong@tier4.jp kenzo.lobos@tier4.jp kyoichi.sugahara@tier4.jp melike@leodrive.ai shunsuke.miura@tier4.jp yihsiang.fang@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp

diff --git a/...perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py b/...perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py
@@ -113,8 +113,8 @@ def create_parameter_dict(*args):
     decompressor_loader = LoadComposableNodes(
         composable_node_descriptions=[
             ComposableNode(
-                package="image_transport_decompressor",
-                plugin="image_preprocessor::ImageTransportDecompressor",
+                package="autoware_image_transport_decompressor",
+                plugin="autoware::image_preprocessor::ImageTransportDecompressor",
                 name="traffic_light_image_decompressor",
                 parameters=[{"encoding": "rgb8"}],
                 remappings=[

diff --git a/launch/tier4_perception_launch/package.xml b/launch/tier4_perception_launch/package.xml
@@ -23,6 +23,7 @@
   <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_image_transport_decompressor</exec_depend>
   <exec_depend>autoware_lidar_apollo_instance_segmentation</exec_depend>
   <exec_depend>autoware_map_based_prediction</exec_depend>
   <exec_depend>autoware_multi_object_tracker</exec_depend>
@@ -46,7 +47,6 @@
   <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>image_transport_decompressor</exec_depend>
   <exec_depend>pointcloud_to_laserscan</exec_depend>
   <exec_depend>topic_tools</exec_depend>
 

diff --git a/perception/autoware_tensorrt_yolox/launch/yolox_s_plus_opt.launch.xml b/perception/autoware_tensorrt_yolox/launch/yolox_s_plus_opt.launch.xml
@@ -14,8 +14,8 @@
   <arg name="use_decompress" default="true" description="use image decompress"/>
   <arg name="build_only" default="false" description="exit after trt engine is built"/>
 
-  <arg name="param_file" default="$(find-pkg-share image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
-  <node pkg="image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
+  <arg name="param_file" default="$(find-pkg-share autoware_image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
+  <node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
     <remap from="~/input/compressed_image" to="$(var input/image)/compressed"/>
     <remap from="~/output/raw_image" to="$(var input/image)"/>
     <param from="$(var param_file)"/>

diff --git a/perception/autoware_tensorrt_yolox/launch/yolox_tiny.launch.xml b/perception/autoware_tensorrt_yolox/launch/yolox_tiny.launch.xml
@@ -8,8 +8,8 @@
   <arg name="use_decompress" default="true" description="use image decompress"/>
   <arg name="build_only" default="false" description="exit after trt engine is built"/>
 
-  <arg name="param_file" default="$(find-pkg-share image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
-  <node pkg="image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
+  <arg name="param_file" default="$(find-pkg-share autoware_image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
+  <node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
     <remap from="~/input/compressed_image" to="$(var input/image)/compressed"/>
     <remap from="~/output/raw_image" to="$(var input/image)"/>
     <param from="$(var param_file)"/>

diff --git a/perception/autoware_tensorrt_yolox/package.xml b/perception/autoware_tensorrt_yolox/package.xml
@@ -30,7 +30,7 @@
   <depend>tensorrt_common</depend>
   <depend>tier4_perception_msgs</depend>
 
-  <exec_depend>image_transport_decompressor</exec_depend>
+  <exec_depend>autoware_image_transport_decompressor</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>

diff --git a/...age_transport_decompressor/CMakeLists.txt → ...age_transport_decompressor/CMakeLists.txt b/...age_transport_decompressor/CMakeLists.txt → ...age_transport_decompressor/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(image_transport_decompressor)
+project(autoware_image_transport_decompressor)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -9,16 +9,16 @@ include_directories(
   ${OpenCV_INCLUDE_DIRS}
 )
 
-ament_auto_add_library(image_transport_decompressor SHARED
+ament_auto_add_library(${PROJECT_NAME} SHARED
   src/image_transport_decompressor.cpp
 )
 
-target_link_libraries(image_transport_decompressor
+target_link_libraries(${PROJECT_NAME}
   ${OpenCV_LIBRARIES}
 )
 
-rclcpp_components_register_node(image_transport_decompressor
-  PLUGIN "image_preprocessor::ImageTransportDecompressor"
+rclcpp_components_register_node(${PROJECT_NAME}
+  PLUGIN "autoware::image_preprocessor::ImageTransportDecompressor"
   EXECUTABLE image_transport_decompressor_node
 )
 

diff --git a/...ng/image_transport_decompressor/README.md → ...re_image_transport_decompressor/README.md b/...ng/image_transport_decompressor/README.md → ...re_image_transport_decompressor/README.md
@@ -22,7 +22,7 @@ The `image_transport_decompressor` is a node that decompresses images.
 
 ## Parameters
 
-{{ json_to_markdown("sensing/image_transport_decompressor/schema/image_transport_decompressor.schema.json") }}
+{{ json_to_markdown("sensing/autoware_image_transport_decompressor/schema/image_transport_decompressor.schema.json") }}
 
 ## Assumptions / Known limits
 

diff --git a/...g/image_transport_decompressor.param.yaml → ...g/image_transport_decompressor.param.yaml b/...g/image_transport_decompressor.param.yaml → ...g/image_transport_decompressor.param.yaml
diff --git a/...mpressor/image_transport_decompressor.hpp → ...mpressor/image_transport_decompressor.hpp b/...mpressor/image_transport_decompressor.hpp → ...mpressor/image_transport_decompressor.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
-#define IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
+#ifndef AUTOWARE__IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
+#define AUTOWARE__IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -24,7 +24,7 @@
 #include <string>
 #include <utility>
 
-namespace image_preprocessor
+namespace autoware::image_preprocessor
 {
 class ImageTransportDecompressor : public rclcpp::Node
 {
@@ -40,6 +40,6 @@ class ImageTransportDecompressor : public rclcpp::Node
   std::string encoding_;
 };
 
-}  // namespace image_preprocessor
+}  // namespace autoware::image_preprocessor
 
-#endif  // IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
+#endif  // AUTOWARE__IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
diff --git a/...h/image_transport_decompressor.launch.xml → ...h/image_transport_decompressor.launch.xml b/...h/image_transport_decompressor.launch.xml → ...h/image_transport_decompressor.launch.xml
@@ -1,9 +1,9 @@
 <launch>
   <arg name="input_topic_name" default="/input/compressed_image"/>
   <arg name="output_topic_name" default="/output/raw_image"/>
-  <arg name="param_file" default="$(find-pkg-share image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
+  <arg name="param_file" default="$(find-pkg-share autoware_image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
 
-  <node pkg="image_transport_decompressor" exec="image_transport_decompressor_node" name="$(anon image_transport_decompressor_node)">
+  <node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="$(anon image_transport_decompressor_node)">
     <remap from="~/input/compressed_image" to="$(var input_topic_name)"/>
     <remap from="~/output/raw_image" to="$(var output_topic_name)"/>
     <param from="$(var param_file)" allow_substs="true"/>

diff --git a/.../image_transport_decompressor/package.xml → ..._image_transport_decompressor/package.xml b/.../image_transport_decompressor/package.xml → ..._image_transport_decompressor/package.xml
@@ -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>image_transport_decompressor</name>
+  <name>autoware_image_transport_decompressor</name>
   <version>0.0.0</version>
   <description>The image_transport_decompressor package</description>
   <maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>

diff --git a/.../image_transport_decompressor.schema.json → .../image_transport_decompressor.schema.json b/.../image_transport_decompressor.schema.json → .../image_transport_decompressor.schema.json
@@ -3,7 +3,7 @@
   "title": "Parameters for Image Transport Decompressor",
   "type": "object",
   "definitions": {
-    "image_transport_decompressor": {
+    "autoware_image_transport_decompressor": {
       "type": "object",
       "properties": {
         "encoding": {
@@ -20,7 +20,7 @@
       "type": "object",
       "properties": {
         "ros__parameters": {
-          "$ref": "#/definitions/image_transport_decompressor"
+          "$ref": "#/definitions/autoware_image_transport_decompressor"
         }
       },
       "required": ["ros__parameters"]

diff --git a/...ssor/src/image_transport_decompressor.cpp → ...ssor/src/image_transport_decompressor.cpp b/...ssor/src/image_transport_decompressor.cpp → ...ssor/src/image_transport_decompressor.cpp
@@ -46,7 +46,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *********************************************************************/
 
-#include "image_transport_decompressor/image_transport_decompressor.hpp"
+#include "autoware/image_transport_decompressor/image_transport_decompressor.hpp"
 
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
@@ -65,7 +65,7 @@
 #include <utility>
 #include <vector>
 
-namespace image_preprocessor
+namespace autoware::image_preprocessor
 {
 ImageTransportDecompressor::ImageTransportDecompressor(const rclcpp::NodeOptions & node_options)
 : rclcpp::Node("image_transport_decompressor", node_options),
@@ -179,7 +179,7 @@ void ImageTransportDecompressor::onCompressedImage(
     raw_image_pub_->publish(std::move(image_ptr));
   }
 }
-}  // namespace image_preprocessor
+}  // namespace autoware::image_preprocessor
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(image_preprocessor::ImageTransportDecompressor)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::image_preprocessor::ImageTransportDecompressor)