refactor: add autoware prefix to lidar_apollo_segmentation_tvm_nodes

Signed-off-by: ktro2828 <kotaro.uetake@tier4.jp>
autowarefoundation · Jul 24, 2024 · d8af8e5 · d8af8e5
1 parent 5adf436
commit d8af8e5
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 28 deletions.
diff --git a/...llo_segmentation_tvm_nodes/CMakeLists.txt → ...llo_segmentation_tvm_nodes/CMakeLists.txt b/...llo_segmentation_tvm_nodes/CMakeLists.txt → ...llo_segmentation_tvm_nodes/CMakeLists.txt
@@ -13,19 +13,19 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.14)
-project(lidar_apollo_segmentation_tvm_nodes)
+project(autoware_lidar_apollo_segmentation_tvm_nodes)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
 
 # Only build if the "core" package has been built.
-if(lidar_apollo_segmentation_tvm_BUILT)
-  # Set lidar_apollo_segmentation_tvm includes as "SYSTEM" to ignore compiler errors on PCL headers
-  include_directories(SYSTEM "${lidar_apollo_segmentation_tvm_INCLUDE_DIRS}")
+if(autoware_lidar_apollo_segmentation_tvm_BUILT)
+  # Set autoware_lidar_apollo_segmentation_tvm includes as "SYSTEM" to ignore compiler errors on PCL headers
+  include_directories(SYSTEM "${autoware_lidar_apollo_segmentation_tvm_INCLUDE_DIRS}")
 
   # Library
   ament_auto_add_library(${PROJECT_NAME} SHARED
-    include/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp
+    include/autoware/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp
     src/lidar_apollo_segmentation_tvm_node.cpp
   )
   target_link_libraries(${PROJECT_NAME} ${lidar_apollo_segmentation_tvm_LIBRARIES})
@@ -47,6 +47,6 @@ if(lidar_apollo_segmentation_tvm_BUILT)
     config
   )
 else()
-  message(WARNING "lidar_apollo_segmentation_tvm not built, skipping package.")
+  message(WARNING "autoware_lidar_apollo_segmentation_tvm not built, skipping package.")
   ament_auto_package()
 endif()
diff --git a/...r_apollo_segmentation_tvm_nodes/README.md → ...r_apollo_segmentation_tvm_nodes/README.md b/...r_apollo_segmentation_tvm_nodes/README.md → ...r_apollo_segmentation_tvm_nodes/README.md
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-# lidar_apollo_segmentation_tvm_nodes
+# autoware_lidar_apollo_segmentation_tvm_nodes
 
 ## Purpose / Use cases
 
@@ -28,7 +28,7 @@ See the design of the algorithm in the core (lidar_apollo_segmentation_tvm) pack
 
 ### Usage
 
-`lidar_apollo_segmentation_tvm` and `lidar_apollo_segmentation_tvm_nodes` will not work without a neural network.
+`autoware_lidar_apollo_segmentation_tvm` and `autoware_lidar_apollo_segmentation_tvm_nodes` will not work without a neural network.
 See the lidar_apollo_segmentation_tvm usage for more information.
 
 ### Assumptions / Known limits

diff --git a/..._apollo_segmentation_tvm_nodes.param.yaml → ..._apollo_segmentation_tvm_nodes.param.yaml b/..._apollo_segmentation_tvm_nodes.param.yaml → ..._apollo_segmentation_tvm_nodes.param.yaml
diff --git a/...es/lidar_apollo_segmentation_tvm_node.hpp → ...es/lidar_apollo_segmentation_tvm_node.hpp b/...es/lidar_apollo_segmentation_tvm_node.hpp → ...es/lidar_apollo_segmentation_tvm_node.hpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef LIDAR_APOLLO_SEGMENTATION_TVM_NODES__LIDAR_APOLLO_SEGMENTATION_TVM_NODE_HPP_
-#define LIDAR_APOLLO_SEGMENTATION_TVM_NODES__LIDAR_APOLLO_SEGMENTATION_TVM_NODE_HPP_
+#ifndef AUTOWARE__LIDAR_APOLLO_SEGMENTATION_TVM_NODES__LIDAR_APOLLO_SEGMENTATION_TVM_NODE_HPP_
+#define AUTOWARE__LIDAR_APOLLO_SEGMENTATION_TVM_NODES__LIDAR_APOLLO_SEGMENTATION_TVM_NODE_HPP_
 
-#include <lidar_apollo_segmentation_tvm/lidar_apollo_segmentation_tvm.hpp>
-#include <lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp>
+#include <autoware/lidar_apollo_segmentation_tvm/lidar_apollo_segmentation_tvm.hpp>
+#include <autoware/lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp>
 #include <rclcpp/node.hpp>
 #include <rclcpp/publisher.hpp>
 #include <rclcpp/subscription.hpp>
@@ -51,4 +51,4 @@ class LIDAR_APOLLO_SEGMENTATION_TVM_NODES_PUBLIC ApolloLidarSegmentationNode : p
 }  // namespace lidar_apollo_segmentation_tvm_nodes
 }  // namespace perception
 }  // namespace autoware
-#endif  // LIDAR_APOLLO_SEGMENTATION_TVM_NODES__LIDAR_APOLLO_SEGMENTATION_TVM_NODE_HPP_
+#endif  // AUTOWARE__LIDAR_APOLLO_SEGMENTATION_TVM_NODES__LIDAR_APOLLO_SEGMENTATION_TVM_NODE_HPP_
diff --git a/...entation_tvm_nodes/visibility_control.hpp → ...entation_tvm_nodes/visibility_control.hpp b/...entation_tvm_nodes/visibility_control.hpp → ...entation_tvm_nodes/visibility_control.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef LIDAR_APOLLO_SEGMENTATION_TVM_NODES__VISIBILITY_CONTROL_HPP_
-#define LIDAR_APOLLO_SEGMENTATION_TVM_NODES__VISIBILITY_CONTROL_HPP_
+#ifndef AUTOWARE__LIDAR_APOLLO_SEGMENTATION_TVM_NODES__VISIBILITY_CONTROL_HPP_
+#define AUTOWARE__LIDAR_APOLLO_SEGMENTATION_TVM_NODES__VISIBILITY_CONTROL_HPP_
 
 #if defined(__WIN32)
 #if defined(LIDAR_APOLLO_SEGMENTATION_TVM_NODES_BUILDING_DLL) || \
@@ -34,4 +34,4 @@
 #error "Unsupported Build Configuration"
 #endif
 
-#endif  // LIDAR_APOLLO_SEGMENTATION_TVM_NODES__VISIBILITY_CONTROL_HPP_
+#endif  // AUTOWARE__LIDAR_APOLLO_SEGMENTATION_TVM_NODES__VISIBILITY_CONTROL_HPP_
diff --git a/...r_apollo_segmentation_tvm_nodes.launch.py → ...r_apollo_segmentation_tvm_nodes.launch.py b/...r_apollo_segmentation_tvm_nodes.launch.py → ...r_apollo_segmentation_tvm_nodes.launch.py
@@ -26,7 +26,7 @@
 
 def generate_launch_description():
     param_file = os.path.join(
-        get_package_share_directory("lidar_apollo_segmentation_tvm_nodes"),
+        get_package_share_directory("autoware_lidar_apollo_segmentation_tvm_nodes"),
         "config/lidar_apollo_segmentation_tvm_nodes.param.yaml",
     )
 
@@ -44,8 +44,8 @@ def generate_launch_description():
 
     # lidar segmentation node execution definition.
     lidar_apollo_segmentation_tvm_node_runner = Node(
-        package="lidar_apollo_segmentation_tvm_nodes",
-        executable="lidar_apollo_segmentation_tvm_nodes_exe",
+        package="autoware_lidar_apollo_segmentation_tvm_nodes",
+        executable="autoware_lidar_apollo_segmentation_tvm_nodes_exe",
         remappings=[
             ("points_in", LaunchConfiguration("input/pointcloud")),
             ("objects_out", LaunchConfiguration("output/objects")),

diff --git a/..._apollo_segmentation_tvm_nodes.launch.xml → ..._apollo_segmentation_tvm_nodes.launch.xml b/..._apollo_segmentation_tvm_nodes.launch.xml → ..._apollo_segmentation_tvm_nodes.launch.xml
@@ -16,10 +16,10 @@
 <launch>
   <arg name="input/pointcloud" default="/sensing/lidar/pointcloud"/>
   <arg name="output/objects" default="labeled_clusters"/>
-  <arg name="param_file" default="$(find-pkg-share lidar_apollo_segmentation_tvm_nodes)/config/lidar_apollo_segmentation_tvm_nodes.param.yaml"/>
+  <arg name="param_file" default="$(find-pkg-share autoware_lidar_apollo_segmentation_tvm_nodes)/config/lidar_apollo_segmentation_tvm_nodes.param.yaml"/>
   <arg name="z_offset" default="-2.0"/>
 
-  <node pkg="lidar_apollo_segmentation_tvm_nodes" exec="lidar_apollo_segmentation_tvm_nodes_exe" name="lidar_apollo_segmentation_tvm_nodes" output="screen">
+  <node pkg="autoware_lidar_apollo_segmentation_tvm_nodes" exec="autoware_lidar_apollo_segmentation_tvm_nodes_exe" name="lidar_apollo_segmentation_tvm_nodes" output="screen">
     <remap from="points_in" to="$(var input/pointcloud)"/>
     <remap from="objects_out" to="$(var output/objects)"/>
     <param name="z_offset" value="$(var z_offset)"/>

diff --git a/...apollo_segmentation_tvm_nodes/package.xml → ...apollo_segmentation_tvm_nodes/package.xml b/...apollo_segmentation_tvm_nodes/package.xml → ...apollo_segmentation_tvm_nodes/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE xml>
 <package format="3">
-  <name>lidar_apollo_segmentation_tvm_nodes</name>
+  <name>autoware_lidar_apollo_segmentation_tvm_nodes</name>
   <version>0.1.0</version>
   <description>lidar_apollo_segmentation_tvm_nodes</description>
   <maintainer email="ambroise.vincent@arm.com">Ambroise Vincent</maintainer>
@@ -12,7 +12,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
-  <depend>lidar_apollo_segmentation_tvm</depend>
+  <depend>autoware_lidar_apollo_segmentation_tvm</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
   <depend>sensor_msgs</depend>

diff --git a/...apollo_segmentation_tvm_nodes.schema.json → ...apollo_segmentation_tvm_nodes.schema.json b/...apollo_segmentation_tvm_nodes.schema.json → ...apollo_segmentation_tvm_nodes.schema.json
diff --git a/...rc/lidar_apollo_segmentation_tvm_node.cpp → ...rc/lidar_apollo_segmentation_tvm_node.cpp b/...rc/lidar_apollo_segmentation_tvm_node.cpp → ...rc/lidar_apollo_segmentation_tvm_node.cpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <lidar_apollo_segmentation_tvm/lidar_apollo_segmentation_tvm.hpp>
-#include <lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp>
+#include <autoware/lidar_apollo_segmentation_tvm/lidar_apollo_segmentation_tvm.hpp>
+#include <autoware/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp>
 #include <rclcpp/logging.hpp>
 #include <rclcpp_components/register_node_macro.hpp>
 

diff --git a/...egmentation_tvm_nodes/test/launch.test.py → ...egmentation_tvm_nodes/test/launch.test.py b/...egmentation_tvm_nodes/test/launch.test.py → ...egmentation_tvm_nodes/test/launch.test.py
@@ -25,14 +25,14 @@
 @pytest.mark.launch_test
 def generate_test_description():
     lidar_apollo_segmentation_tvm = Node(
-        package="lidar_apollo_segmentation_tvm_nodes",
-        executable="lidar_apollo_segmentation_tvm_nodes_exe",
+        package="autoware_lidar_apollo_segmentation_tvm_nodes",
+        executable="autoware_lidar_apollo_segmentation_tvm_nodes_exe",
         name="lidar_apollo_segmentation_tvm_nodes",
         namespace="benchmark",
         output="screen",
         parameters=[
             os.path.join(
-                get_package_share_directory("lidar_apollo_segmentation_tvm_nodes"),
+                get_package_share_directory("autoware_lidar_apollo_segmentation_tvm_nodes"),
                 "param/test.param.yaml",
             )
         ],