refactor(shape_estimation): add package name prefix of autoware_ (#7999)

* refactor(shape_estimation): add package name prefix of autoware_ Signed-off-by: badai-nguyen <[email protected]> * style(pre-commit): autofix * fix: mising prefix Signed-off-by: badai-nguyen <[email protected]> * fix: cmake Signed-off-by: badai-nguyen <[email protected]> --------- Signed-off-by: badai-nguyen <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
autowarefoundation · Jul 23, 2024 · 7675b06 · 7675b06
1 parent 1ee7511
commit 7675b06
Show file tree

Hide file tree

Showing 54 changed files with 15 additions and 15 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -134,7 +134,7 @@ perception/occupancy_grid_map_outlier_filter/** [email protected] yoshi.r
 perception/probabilistic_occupancy_grid_map/** [email protected] [email protected] [email protected]
 perception/radar_tracks_msgs_converter/** [email protected] [email protected] [email protected] [email protected]
 perception/autoware_raindrop_cluster_filter/** [email protected] [email protected] [email protected]
-perception/shape_estimation/** [email protected] [email protected]
+perception/autoware_shape_estimation/** [email protected] [email protected]
 perception/simple_object_merger/** [email protected] [email protected] [email protected]
 perception/autoware_tensorrt_classifier/** [email protected] [email protected]
 perception/tensorrt_yolox/** [email protected] [email protected]

diff --git a/...tion_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml b/...tion_launch/launch/object_recognition/detection/detector/camera_lidar_detector.launch.xml
@@ -166,7 +166,7 @@
     </group>
 
     <group>
-      <include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
+      <include file="$(find-pkg-share autoware_shape_estimation)/launch/shape_estimation.launch.xml">
         <arg name="input/objects" value="clusters"/>
         <arg name="output/objects" value="objects_with_feature"/>
       </include>
@@ -222,7 +222,7 @@
       <group>
         <let name="shape_estimation/input" value="filtered/clusters" if="$(var use_low_intensity_cluster_filter)"/>
         <let name="shape_estimation/input" value="clusters" unless="$(var use_low_intensity_cluster_filter)"/>
-        <include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
+        <include file="$(find-pkg-share autoware_shape_estimation)/launch/shape_estimation.launch.xml">
           <arg name="input/objects" value="$(var shape_estimation/input)"/>
           <arg name="output/objects" value="objects_with_feature"/>
         </include>

diff --git a/...ception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml b/...ception_launch/launch/object_recognition/detection/detector/lidar_dnn_detector.launch.xml
@@ -66,7 +66,7 @@
     </group>
 
     <group>
-      <include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
+      <include file="$(find-pkg-share autoware_shape_estimation)/launch/shape_estimation.launch.xml">
         <arg name="input/objects" value="labeled_clusters"/>
         <arg name="output/objects" value="objects_with_feature"/>
         <arg name="use_vehicle_reference_yaw" value="true"/>

diff --git a/...eption_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml b/...eption_launch/launch/object_recognition/detection/detector/lidar_rule_detector.launch.xml
@@ -21,7 +21,7 @@
     </group>
 
     <group>
-      <include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
+      <include file="$(find-pkg-share autoware_shape_estimation)/launch/shape_estimation.launch.xml">
         <arg name="input/objects" value="clusters"/>
         <arg name="output/objects" value="objects_with_feature"/>
       </include>

diff --git a/launch/tier4_perception_launch/package.xml b/launch/tier4_perception_launch/package.xml
@@ -31,6 +31,7 @@
   <exec_depend>autoware_radar_object_clustering</exec_depend>
   <exec_depend>autoware_radar_object_tracker</exec_depend>
   <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>compare_map_segmentation</exec_depend>
   <exec_depend>elevation_map_loader</exec_depend>
@@ -40,7 +41,6 @@
   <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>shape_estimation</exec_depend>
   <exec_depend>topic_tools</exec_depend>
   <exec_depend>traffic_light_arbiter</exec_depend>
   <exec_depend>traffic_light_classifier</exec_depend>

diff --git a/perception/autoware_detection_by_tracker/package.xml b/perception/autoware_detection_by_tracker/package.xml
@@ -14,12 +14,12 @@
   <buildtool_depend>eigen3_cmake_module</buildtool_depend>
 
   <depend>autoware_euclidean_cluster</depend>
+  <depend>autoware_shape_estimation</depend>
   <depend>autoware_universe_utils</depend>
   <depend>eigen</depend>
   <depend>object_recognition_utils</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
-  <depend>shape_estimation</depend>
   <depend>tf2</depend>
   <depend>tf2_geometry_msgs</depend>
   <depend>tf2_ros</depend>

diff --git a/perception/shape_estimation/CMakeLists.txt → .../autoware_shape_estimation/CMakeLists.txt b/perception/shape_estimation/CMakeLists.txt → .../autoware_shape_estimation/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(shape_estimation)
+project(autoware_shape_estimation)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -54,7 +54,7 @@ target_include_directories(${PROJECT_NAME}
 ament_target_dependencies(${PROJECT_NAME} ${SHAPE_ESTIMATION_DEPENDENCIES})
 
 target_link_libraries(${PROJECT_NAME}
-  shape_estimation_lib
+  ${PROJECT_NAME}_lib
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}

diff --git a/perception/shape_estimation/README.md → ...ption/autoware_shape_estimation/README.md b/perception/shape_estimation/README.md → ...ption/autoware_shape_estimation/README.md
@@ -1,4 +1,4 @@
-# shape_estimation
+# autoware_shape_estimation
 
 ## Purpose
 
@@ -36,7 +36,7 @@ This node calculates a refined object shape (bounding box, cylinder, convex hull
 
 ## Parameters
 
-{{ json_to_markdown("perception/autoware/shape_estimation/schema/shape_estimation.schema.json") }}
+{{ json_to_markdown("perception/autoware_shape_estimation/schema/shape_estimation.schema.json") }}
 
 ## Assumptions / Known limits
 

diff --git a/...mation/config/shape_estimation.param.yaml → ...mation/config/shape_estimation.param.yaml b/...mation/config/shape_estimation.param.yaml → ...mation/config/shape_estimation.param.yaml
diff --git a/...stimation/corrector/bicycle_corrector.hpp → ...stimation/corrector/bicycle_corrector.hpp b/...stimation/corrector/bicycle_corrector.hpp → ...stimation/corrector/bicycle_corrector.hpp
diff --git a/...pe_estimation/corrector/bus_corrector.hpp → ...pe_estimation/corrector/bus_corrector.hpp b/...pe_estimation/corrector/bus_corrector.hpp → ...pe_estimation/corrector/bus_corrector.hpp
diff --git a/...pe_estimation/corrector/car_corrector.hpp → ...pe_estimation/corrector/car_corrector.hpp b/...pe_estimation/corrector/car_corrector.hpp → ...pe_estimation/corrector/car_corrector.hpp
diff --git a/.../shape_estimation/corrector/corrector.hpp → .../shape_estimation/corrector/corrector.hpp b/.../shape_estimation/corrector/corrector.hpp → .../shape_estimation/corrector/corrector.hpp
diff --git a/...imation/corrector/corrector_interface.hpp → ...imation/corrector/corrector_interface.hpp b/...imation/corrector/corrector_interface.hpp → ...imation/corrector/corrector_interface.hpp
diff --git a/...ape_estimation/corrector/no_corrector.hpp → ...ape_estimation/corrector/no_corrector.hpp b/...ape_estimation/corrector/no_corrector.hpp → ...ape_estimation/corrector/no_corrector.hpp
diff --git a/...rector/reference_shape_size_corrector.hpp → ...rector/reference_shape_size_corrector.hpp b/...rector/reference_shape_size_corrector.hpp → ...rector/reference_shape_size_corrector.hpp
diff --git a/...stimation/corrector/trailer_corrector.hpp → ...stimation/corrector/trailer_corrector.hpp b/...stimation/corrector/trailer_corrector.hpp → ...stimation/corrector/trailer_corrector.hpp
diff --git a/..._estimation/corrector/truck_corrector.hpp → ..._estimation/corrector/truck_corrector.hpp b/..._estimation/corrector/truck_corrector.hpp → ..._estimation/corrector/truck_corrector.hpp
diff --git a/...ware/shape_estimation/corrector/utils.hpp → ...ware/shape_estimation/corrector/utils.hpp b/...ware/shape_estimation/corrector/utils.hpp → ...ware/shape_estimation/corrector/utils.hpp
diff --git a/...stimation/corrector/vehicle_corrector.hpp → ...stimation/corrector/vehicle_corrector.hpp b/...stimation/corrector/vehicle_corrector.hpp → ...stimation/corrector/vehicle_corrector.hpp
diff --git a/...re/shape_estimation/filter/bus_filter.hpp → ...re/shape_estimation/filter/bus_filter.hpp b/...re/shape_estimation/filter/bus_filter.hpp → ...re/shape_estimation/filter/bus_filter.hpp
diff --git a/...re/shape_estimation/filter/car_filter.hpp → ...re/shape_estimation/filter/car_filter.hpp b/...re/shape_estimation/filter/car_filter.hpp → ...re/shape_estimation/filter/car_filter.hpp
diff --git a/...toware/shape_estimation/filter/filter.hpp → ...toware/shape_estimation/filter/filter.hpp b/...toware/shape_estimation/filter/filter.hpp → ...toware/shape_estimation/filter/filter.hpp
diff --git a/...pe_estimation/filter/filter_interface.hpp → ...pe_estimation/filter/filter_interface.hpp b/...pe_estimation/filter/filter_interface.hpp → ...pe_estimation/filter/filter_interface.hpp
diff --git a/...are/shape_estimation/filter/no_filter.hpp → ...are/shape_estimation/filter/no_filter.hpp b/...are/shape_estimation/filter/no_filter.hpp → ...are/shape_estimation/filter/no_filter.hpp
diff --git a/...hape_estimation/filter/trailer_filter.hpp → ...hape_estimation/filter/trailer_filter.hpp b/...hape_estimation/filter/trailer_filter.hpp → ...hape_estimation/filter/trailer_filter.hpp
diff --git a/.../shape_estimation/filter/truck_filter.hpp → .../shape_estimation/filter/truck_filter.hpp b/.../shape_estimation/filter/truck_filter.hpp → .../shape_estimation/filter/truck_filter.hpp
diff --git a/...utoware/shape_estimation/filter/utils.hpp → ...utoware/shape_estimation/filter/utils.hpp b/...utoware/shape_estimation/filter/utils.hpp → ...utoware/shape_estimation/filter/utils.hpp
diff --git a/...e/shape_estimation/model/bounding_box.hpp → ...e/shape_estimation/model/bounding_box.hpp b/...e/shape_estimation/model/bounding_box.hpp → ...e/shape_estimation/model/bounding_box.hpp
diff --git a/...re/shape_estimation/model/convex_hull.hpp → ...re/shape_estimation/model/convex_hull.hpp b/...re/shape_estimation/model/convex_hull.hpp → ...re/shape_estimation/model/convex_hull.hpp
diff --git a/...oware/shape_estimation/model/cylinder.hpp → ...oware/shape_estimation/model/cylinder.hpp b/...oware/shape_estimation/model/cylinder.hpp → ...oware/shape_estimation/model/cylinder.hpp
diff --git a/...autoware/shape_estimation/model/model.hpp → ...autoware/shape_estimation/model/model.hpp b/...autoware/shape_estimation/model/model.hpp → ...autoware/shape_estimation/model/model.hpp
diff --git a/...hape_estimation/model/model_interface.hpp → ...hape_estimation/model/model_interface.hpp b/...hape_estimation/model/model_interface.hpp → ...hape_estimation/model/model_interface.hpp
diff --git a/...ware/shape_estimation/shape_estimator.hpp → ...ware/shape_estimation/shape_estimator.hpp b/...ware/shape_estimation/shape_estimator.hpp → ...ware/shape_estimation/shape_estimator.hpp
diff --git a/...mation/launch/shape_estimation.launch.xml → ...mation/launch/shape_estimation.launch.xml b/...mation/launch/shape_estimation.launch.xml → ...mation/launch/shape_estimation.launch.xml
@@ -3,9 +3,9 @@
   <arg name="output/objects" default="shape_estimated_objects"/>
   <arg name="node_name" default="shape_estimation"/>
   <!-- Parameter -->
-  <arg name="config_file" default="$(find-pkg-share shape_estimation)/config/shape_estimation.param.yaml"/>
+  <arg name="config_file" default="$(find-pkg-share autoware_shape_estimation)/config/shape_estimation.param.yaml"/>
 
-  <node pkg="shape_estimation" exec="shape_estimation_node" name="$(var node_name)" output="screen">
+  <node pkg="autoware_shape_estimation" exec="shape_estimation_node" name="$(var node_name)" output="screen">
     <remap from="input" to="$(var input/objects)"/>
     <remap from="objects" to="$(var output/objects)"/>
     <param from="$(var config_file)"/>

diff --git a/...estimation/lib/corrector/no_corrector.cpp → ...estimation/lib/corrector/no_corrector.cpp b/...estimation/lib/corrector/no_corrector.cpp → ...estimation/lib/corrector/no_corrector.cpp
diff --git a/.../shape_estimation/lib/corrector/utils.cpp → ..._shape_estimation/lib/corrector/utils.cpp b/.../shape_estimation/lib/corrector/utils.cpp → ..._shape_estimation/lib/corrector/utils.cpp
diff --git a/...hape_estimation/lib/filter/bus_filter.cpp → ...hape_estimation/lib/filter/bus_filter.cpp b/...hape_estimation/lib/filter/bus_filter.cpp → ...hape_estimation/lib/filter/bus_filter.cpp
diff --git a/...hape_estimation/lib/filter/car_filter.cpp → ...hape_estimation/lib/filter/car_filter.cpp b/...hape_estimation/lib/filter/car_filter.cpp → ...hape_estimation/lib/filter/car_filter.cpp
diff --git a/...shape_estimation/lib/filter/no_filter.cpp → ...shape_estimation/lib/filter/no_filter.cpp b/...shape_estimation/lib/filter/no_filter.cpp → ...shape_estimation/lib/filter/no_filter.cpp
diff --git a/..._estimation/lib/filter/trailer_filter.cpp → ..._estimation/lib/filter/trailer_filter.cpp b/..._estimation/lib/filter/trailer_filter.cpp → ..._estimation/lib/filter/trailer_filter.cpp
diff --git a/...pe_estimation/lib/filter/truck_filter.cpp → ...pe_estimation/lib/filter/truck_filter.cpp b/...pe_estimation/lib/filter/truck_filter.cpp → ...pe_estimation/lib/filter/truck_filter.cpp
diff --git a/...ion/shape_estimation/lib/filter/utils.cpp → ...are_shape_estimation/lib/filter/utils.cpp b/...ion/shape_estimation/lib/filter/utils.cpp → ...are_shape_estimation/lib/filter/utils.cpp
diff --git a/...ape_estimation/lib/model/bounding_box.cpp → ...ape_estimation/lib/model/bounding_box.cpp b/...ape_estimation/lib/model/bounding_box.cpp → ...ape_estimation/lib/model/bounding_box.cpp
diff --git a/...hape_estimation/lib/model/convex_hull.cpp → ...hape_estimation/lib/model/convex_hull.cpp b/...hape_estimation/lib/model/convex_hull.cpp → ...hape_estimation/lib/model/convex_hull.cpp
diff --git a/...n/shape_estimation/lib/model/cylinder.cpp → ...e_shape_estimation/lib/model/cylinder.cpp b/...n/shape_estimation/lib/model/cylinder.cpp → ...e_shape_estimation/lib/model/cylinder.cpp
diff --git a/.../shape_estimation/lib/shape_estimator.cpp → ..._shape_estimation/lib/shape_estimator.cpp b/.../shape_estimation/lib/shape_estimator.cpp → ..._shape_estimation/lib/shape_estimator.cpp
diff --git a/perception/shape_estimation/package.xml → ...ion/autoware_shape_estimation/package.xml b/perception/shape_estimation/package.xml → ...ion/autoware_shape_estimation/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>shape_estimation</name>
+  <name>autoware_shape_estimation</name>
   <version>0.1.0</version>
   <description>This package implements a shape estimation algorithm as a ROS 2 node</description>
   <maintainer email="[email protected]">Yukihiro Saito</maintainer>

diff --git a/...ation/schema/shape_estimation.schema.json → ...ation/schema/shape_estimation.schema.json b/...ation/schema/shape_estimation.schema.json → ...ation/schema/shape_estimation.schema.json
diff --git a/..._estimation/src/shape_estimation_node.cpp → ..._estimation/src/shape_estimation_node.cpp b/..._estimation/src/shape_estimation_node.cpp → ..._estimation/src/shape_estimation_node.cpp
diff --git a/..._estimation/src/shape_estimation_node.hpp → ..._estimation/src/shape_estimation_node.hpp b/..._estimation/src/shape_estimation_node.hpp → ..._estimation/src/shape_estimation_node.hpp
diff --git a/...shape_estimation/test_shape_estimator.cpp → ...shape_estimation/test_shape_estimator.cpp b/...shape_estimation/test_shape_estimator.cpp → ...shape_estimation/test_shape_estimator.cpp
diff --git a/...estimation/test/test_shape_estimation.cpp → ...estimation/test/test_shape_estimation.cpp b/...estimation/test/test_shape_estimation.cpp → ...estimation/test/test_shape_estimation.cpp
diff --git a/simulator/dummy_perception_publisher/launch/dummy_perception_publisher.launch.xml b/simulator/dummy_perception_publisher/launch/dummy_perception_publisher.launch.xml
@@ -24,7 +24,7 @@
         <param name="publish_ground_truth" value="true"/>
         <remap from="output/debug/ground_truth_objects" to="debug/ground_truth_objects"/>
       </node>
-      <include file="$(find-pkg-share shape_estimation)/launch/shape_estimation.launch.xml">
+      <include file="$(find-pkg-share autoware_shape_estimation)/launch/shape_estimation.launch.xml">
         <arg name="input/objects" value="/perception/object_recognition/detection/labeled_clusters"/>
         <arg name="output/objects" value="/perception/object_recognition/detection/objects_with_feature"/>
       </include>