From d8af8e5042393bda82dd5959a04340cccb3cca96 Mon Sep 17 00:00:00 2001 From: ktro2828 Date: Fri, 12 Jul 2024 14:57:16 +0900 Subject: [PATCH] refactor: add autoware prefix to lidar_apollo_segmentation_tvm_nodes Signed-off-by: ktro2828 --- .../CMakeLists.txt | 12 ++++++------ .../README.md | 4 ++-- .../lidar_apollo_segmentation_tvm_nodes.param.yaml | 0 .../lidar_apollo_segmentation_tvm_node.hpp | 10 +++++----- .../visibility_control.hpp | 6 +++--- .../lidar_apollo_segmentation_tvm_nodes.launch.py | 6 +++--- .../lidar_apollo_segmentation_tvm_nodes.launch.xml | 4 ++-- .../package.xml | 4 ++-- .../lidar_apollo_segmentation_tvm_nodes.schema.json | 0 .../src/lidar_apollo_segmentation_tvm_node.cpp | 4 ++-- .../test/launch.test.py | 6 +++--- 11 files changed, 28 insertions(+), 28 deletions(-) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/CMakeLists.txt (73%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/README.md (94%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/config/lidar_apollo_segmentation_tvm_nodes.param.yaml (100%) rename perception/{lidar_apollo_segmentation_tvm_nodes/include => autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware}/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp (79%) rename perception/{lidar_apollo_segmentation_tvm_nodes/include => autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware}/lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp (85%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/launch/lidar_apollo_segmentation_tvm_nodes.launch.py (90%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/launch/lidar_apollo_segmentation_tvm_nodes.launch.xml (76%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/package.xml (87%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/schema/lidar_apollo_segmentation_tvm_nodes.schema.json (100%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/src/lidar_apollo_segmentation_tvm_node.cpp (94%) rename perception/{lidar_apollo_segmentation_tvm_nodes => autoware_lidar_apollo_segmentation_tvm_nodes}/test/launch.test.py (88%) diff --git a/perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt similarity index 73% rename from perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt index 100e14277ec1b..eed6f6afdd654 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt +++ b/perception/autoware_lidar_apollo_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/perception/lidar_apollo_segmentation_tvm_nodes/README.md b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/README.md similarity index 94% rename from perception/lidar_apollo_segmentation_tvm_nodes/README.md rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/README.md index a9ffd59f228ec..cc6be49ccc30f 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/README.md +++ b/perception/autoware_lidar_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/perception/lidar_apollo_segmentation_tvm_nodes/config/lidar_apollo_segmentation_tvm_nodes.param.yaml b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/config/lidar_apollo_segmentation_tvm_nodes.param.yaml similarity index 100% rename from perception/lidar_apollo_segmentation_tvm_nodes/config/lidar_apollo_segmentation_tvm_nodes.param.yaml rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/config/lidar_apollo_segmentation_tvm_nodes.param.yaml diff --git a/perception/lidar_apollo_segmentation_tvm_nodes/include/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp similarity index 79% rename from perception/lidar_apollo_segmentation_tvm_nodes/include/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp index eb05ca28c3a39..5b55cb3e5550e 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/include/lidar_apollo_segmentation_tvm_nodes/lidar_apollo_segmentation_tvm_node.hpp +++ b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware/lidar_apollo_segmentation_tvm_nodes/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 -#include +#include +#include #include #include #include @@ -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/perception/lidar_apollo_segmentation_tvm_nodes/include/lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware/lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp similarity index 85% rename from perception/lidar_apollo_segmentation_tvm_nodes/include/lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware/lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp index 0521737a96ed1..a5ae91057792d 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/include/lidar_apollo_segmentation_tvm_nodes/visibility_control.hpp +++ b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/include/autoware/lidar_apollo_segmentation_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/perception/lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.py b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.py similarity index 90% rename from perception/lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.py rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.py index 2d070f2611ac5..f706c97489ba0 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.py +++ b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/launch/lidar_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/perception/lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.xml b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.xml similarity index 76% rename from perception/lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.xml rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.xml index c97d7356f5616..5e92cf187f3ae 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.xml +++ b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/launch/lidar_apollo_segmentation_tvm_nodes.launch.xml @@ -16,10 +16,10 @@ - + - + diff --git a/perception/lidar_apollo_segmentation_tvm_nodes/package.xml b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/package.xml similarity index 87% rename from perception/lidar_apollo_segmentation_tvm_nodes/package.xml rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/package.xml index 7d3ac6fbe5ac7..1fe2f28870189 100755 --- a/perception/lidar_apollo_segmentation_tvm_nodes/package.xml +++ b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/package.xml @@ -1,7 +1,7 @@ - lidar_apollo_segmentation_tvm_nodes + autoware_lidar_apollo_segmentation_tvm_nodes 0.1.0 lidar_apollo_segmentation_tvm_nodes Ambroise Vincent @@ -12,7 +12,7 @@ ament_cmake_auto autoware_cmake - lidar_apollo_segmentation_tvm + autoware_lidar_apollo_segmentation_tvm rclcpp rclcpp_components sensor_msgs diff --git a/perception/lidar_apollo_segmentation_tvm_nodes/schema/lidar_apollo_segmentation_tvm_nodes.schema.json b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/schema/lidar_apollo_segmentation_tvm_nodes.schema.json similarity index 100% rename from perception/lidar_apollo_segmentation_tvm_nodes/schema/lidar_apollo_segmentation_tvm_nodes.schema.json rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/schema/lidar_apollo_segmentation_tvm_nodes.schema.json diff --git a/perception/lidar_apollo_segmentation_tvm_nodes/src/lidar_apollo_segmentation_tvm_node.cpp b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/src/lidar_apollo_segmentation_tvm_node.cpp similarity index 94% rename from perception/lidar_apollo_segmentation_tvm_nodes/src/lidar_apollo_segmentation_tvm_node.cpp rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/src/lidar_apollo_segmentation_tvm_node.cpp index 618d2e258c99b..c062881379abf 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/src/lidar_apollo_segmentation_tvm_node.cpp +++ b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/src/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 -#include +#include +#include #include #include diff --git a/perception/lidar_apollo_segmentation_tvm_nodes/test/launch.test.py b/perception/autoware_lidar_apollo_segmentation_tvm_nodes/test/launch.test.py similarity index 88% rename from perception/lidar_apollo_segmentation_tvm_nodes/test/launch.test.py rename to perception/autoware_lidar_apollo_segmentation_tvm_nodes/test/launch.test.py index 0a9adafc3f641..9590b3fde2745 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/test/launch.test.py +++ b/perception/autoware_lidar_apollo_segmentation_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", ) ],