diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a1594a27f357f..c8c348f30971e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -21,6 +21,7 @@ common/autoware_signal_processing/** ali.boyali@tier4.jp fumiya.watanabe@tier4.j common/autoware_test_utils/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp zulfaqar.azmi@tier4.jp common/autoware_testing/** adam.dabrowski@robotec.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp common/autoware_time_utils/** christopherj.ho@gmail.com shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp +common/autoware_tvm_utility/** ambroise.vincent@arm.com xinyu.wang@tier4.jp common/autoware_universe_utils/** mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp common/autoware_vehicle_info_utils/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp common/bag_time_manager_rviz_plugin/** taiki.tanaka@tier4.jp @@ -41,7 +42,6 @@ common/tier4_traffic_light_rviz_plugin/** satoshi.ota@tier4.jp common/tier4_vehicle_rviz_plugin/** yukihiro.saito@tier4.jp common/traffic_light_recognition_marker_publisher/** shumpei.wakabayashi@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp common/traffic_light_utils/** kotaro.uetake@tier4.jp satoshi.ota@tier4.jp shunsuke.miura@tier4.jp -common/tvm_utility/** ambroise.vincent@arm.com xinyu.wang@tier4.jp control/autoware_autonomous_emergency_braking/** daniel.sanchez@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp tomoya.kimura@tier4.jp control/autoware_collision_detector/** go.sakayori@tier4.jp kyoichi.sugahara@tier4.jp tomohito.ando@tier4.jp control/autoware_control_validator/** kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp diff --git a/common/tvm_utility/.gitignore b/common/autoware_tvm_utility/.gitignore similarity index 100% rename from common/tvm_utility/.gitignore rename to common/autoware_tvm_utility/.gitignore diff --git a/common/tvm_utility/CMakeLists.txt b/common/autoware_tvm_utility/CMakeLists.txt similarity index 97% rename from common/tvm_utility/CMakeLists.txt rename to common/autoware_tvm_utility/CMakeLists.txt index c0a0d7385f615..16bd0cdaa40e5 100644 --- a/common/tvm_utility/CMakeLists.txt +++ b/common/autoware_tvm_utility/CMakeLists.txt @@ -13,7 +13,7 @@ # limitations under the License. cmake_minimum_required(VERSION 3.14) -project(tvm_utility) +project(autoware_tvm_utility) include("${PROJECT_NAME}-extras.cmake") @@ -72,7 +72,7 @@ if(BUILD_TESTING) target_include_directories("${TEST_CASE_NAME}" SYSTEM PUBLIC "${OpenCV_INCLUDE_DIRS}" - "${tvm_utility_FOUND_INCLUDE_DIRS}" + "${autoware_tvm_utility_FOUND_INCLUDE_DIRS}" "data/models/${TEST_CASE_NAME}_${CMAKE_SYSTEM_PROCESSOR}" "include" ) @@ -130,7 +130,7 @@ if(BUILD_EXAMPLE) target_include_directories("${EXAMPLE_NAME}" SYSTEM PUBLIC "${OpenCV_INCLUDE_DIRS}" - "${tvm_utility_FOUND_INCLUDE_DIRS}" + "${autoware_tvm_utility_FOUND_INCLUDE_DIRS}" "data/models" "include" ) diff --git a/common/tvm_utility/README.md b/common/autoware_tvm_utility/README.md similarity index 100% rename from common/tvm_utility/README.md rename to common/autoware_tvm_utility/README.md diff --git a/common/tvm_utility/artifacts/README.md b/common/autoware_tvm_utility/artifacts/README.md similarity index 100% rename from common/tvm_utility/artifacts/README.md rename to common/autoware_tvm_utility/artifacts/README.md diff --git a/common/tvm_utility/artifacts/yolo_v2_tiny/anchors.csv b/common/autoware_tvm_utility/artifacts/yolo_v2_tiny/anchors.csv similarity index 100% rename from common/tvm_utility/artifacts/yolo_v2_tiny/anchors.csv rename to common/autoware_tvm_utility/artifacts/yolo_v2_tiny/anchors.csv diff --git a/common/tvm_utility/artifacts/yolo_v2_tiny/labels.txt b/common/autoware_tvm_utility/artifacts/yolo_v2_tiny/labels.txt similarity index 100% rename from common/tvm_utility/artifacts/yolo_v2_tiny/labels.txt rename to common/autoware_tvm_utility/artifacts/yolo_v2_tiny/labels.txt diff --git a/common/tvm_utility/tvm_utility-extras.cmake b/common/autoware_tvm_utility/autoware_tvm_utility-extras.cmake similarity index 100% rename from common/tvm_utility/tvm_utility-extras.cmake rename to common/autoware_tvm_utility/autoware_tvm_utility-extras.cmake diff --git a/common/tvm_utility/config/yolo_v2_tiny_example.param.yaml b/common/autoware_tvm_utility/config/yolo_v2_tiny_example.param.yaml similarity index 100% rename from common/tvm_utility/config/yolo_v2_tiny_example.param.yaml rename to common/autoware_tvm_utility/config/yolo_v2_tiny_example.param.yaml diff --git a/common/tvm_utility/data/models/abs_model_aarch64/deploy_graph.json b/common/autoware_tvm_utility/data/models/abs_model_aarch64/deploy_graph.json similarity index 100% rename from common/tvm_utility/data/models/abs_model_aarch64/deploy_graph.json rename to common/autoware_tvm_utility/data/models/abs_model_aarch64/deploy_graph.json diff --git a/common/tvm_utility/data/models/abs_model_aarch64/deploy_lib.so b/common/autoware_tvm_utility/data/models/abs_model_aarch64/deploy_lib.so similarity index 100% rename from common/tvm_utility/data/models/abs_model_aarch64/deploy_lib.so rename to common/autoware_tvm_utility/data/models/abs_model_aarch64/deploy_lib.so diff --git a/common/tvm_utility/data/models/abs_model_aarch64/deploy_param.params b/common/autoware_tvm_utility/data/models/abs_model_aarch64/deploy_param.params similarity index 100% rename from common/tvm_utility/data/models/abs_model_aarch64/deploy_param.params rename to common/autoware_tvm_utility/data/models/abs_model_aarch64/deploy_param.params diff --git a/common/tvm_utility/data/models/abs_model_aarch64/inference_engine_tvm_config.hpp b/common/autoware_tvm_utility/data/models/abs_model_aarch64/inference_engine_tvm_config.hpp similarity index 79% rename from common/tvm_utility/data/models/abs_model_aarch64/inference_engine_tvm_config.hpp rename to common/autoware_tvm_utility/data/models/abs_model_aarch64/inference_engine_tvm_config.hpp index 09c8c0beacebe..a32f56bac94b2 100644 --- a/common/tvm_utility/data/models/abs_model_aarch64/inference_engine_tvm_config.hpp +++ b/common/autoware_tvm_utility/data/models/abs_model_aarch64/inference_engine_tvm_config.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "tvm_utility/pipeline.hpp" +#include "autoware/tvm_utility/pipeline.hpp" -#ifndef COMMON__TVM_UTILITY__DATA__MODELS__ABS_MODEL_AARCH64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT -#define COMMON__TVM_UTILITY__DATA__MODELS__ABS_MODEL_AARCH64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ +#ifndef COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__ABS_MODEL_AARCH64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT +#define COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__ABS_MODEL_AARCH64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ namespace model_zoo { @@ -50,5 +50,5 @@ static const tvm_utility::pipeline::InferenceEngineTVMConfig config{ } // namespace engine_load } // namespace inf_test } // namespace model_zoo -#endif // COMMON__TVM_UTILITY__DATA__MODELS__ABS_MODEL_AARCH64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ +#endif // COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__ABS_MODEL_AARCH64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT diff --git a/common/tvm_utility/data/models/abs_model_x86_64/deploy_graph.json b/common/autoware_tvm_utility/data/models/abs_model_x86_64/deploy_graph.json similarity index 100% rename from common/tvm_utility/data/models/abs_model_x86_64/deploy_graph.json rename to common/autoware_tvm_utility/data/models/abs_model_x86_64/deploy_graph.json diff --git a/common/tvm_utility/data/models/abs_model_x86_64/deploy_lib.so b/common/autoware_tvm_utility/data/models/abs_model_x86_64/deploy_lib.so similarity index 100% rename from common/tvm_utility/data/models/abs_model_x86_64/deploy_lib.so rename to common/autoware_tvm_utility/data/models/abs_model_x86_64/deploy_lib.so diff --git a/common/tvm_utility/data/models/abs_model_x86_64/deploy_param.params b/common/autoware_tvm_utility/data/models/abs_model_x86_64/deploy_param.params similarity index 100% rename from common/tvm_utility/data/models/abs_model_x86_64/deploy_param.params rename to common/autoware_tvm_utility/data/models/abs_model_x86_64/deploy_param.params diff --git a/common/tvm_utility/data/models/abs_model_x86_64/inference_engine_tvm_config.hpp b/common/autoware_tvm_utility/data/models/abs_model_x86_64/inference_engine_tvm_config.hpp similarity index 78% rename from common/tvm_utility/data/models/abs_model_x86_64/inference_engine_tvm_config.hpp rename to common/autoware_tvm_utility/data/models/abs_model_x86_64/inference_engine_tvm_config.hpp index 7a7e3ef97c1b3..1455ccdcecb39 100644 --- a/common/tvm_utility/data/models/abs_model_x86_64/inference_engine_tvm_config.hpp +++ b/common/autoware_tvm_utility/data/models/abs_model_x86_64/inference_engine_tvm_config.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "tvm_utility/pipeline.hpp" +#include "autoware/tvm_utility/pipeline.hpp" -#ifndef COMMON__TVM_UTILITY__DATA__MODELS__ABS_MODEL_X86_64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT -#define COMMON__TVM_UTILITY__DATA__MODELS__ABS_MODEL_X86_64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ +#ifndef COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__ABS_MODEL_X86_64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT +#define COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__ABS_MODEL_X86_64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ namespace model_zoo { @@ -49,5 +49,5 @@ static const tvm_utility::pipeline::InferenceEngineTVMConfig config{ } // namespace engine_load } // namespace inf_test } // namespace model_zoo -#endif // COMMON__TVM_UTILITY__DATA__MODELS__ABS_MODEL_X86_64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ +#endif // COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__ABS_MODEL_X86_64__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT diff --git a/common/tvm_utility/data/models/yolo_v2_tiny/inference_engine_tvm_config.hpp b/common/autoware_tvm_utility/data/models/yolo_v2_tiny/inference_engine_tvm_config.hpp similarity index 80% rename from common/tvm_utility/data/models/yolo_v2_tiny/inference_engine_tvm_config.hpp rename to common/autoware_tvm_utility/data/models/yolo_v2_tiny/inference_engine_tvm_config.hpp index 45ff0d8ce33e3..d8e591077a5d4 100644 --- a/common/tvm_utility/data/models/yolo_v2_tiny/inference_engine_tvm_config.hpp +++ b/common/autoware_tvm_utility/data/models/yolo_v2_tiny/inference_engine_tvm_config.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "tvm_utility/pipeline.hpp" +#include "autoware/tvm_utility/pipeline.hpp" -#ifndef COMMON__TVM_UTILITY__DATA__MODELS__YOLO_V2_TINY__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT -#define COMMON__TVM_UTILITY__DATA__MODELS__YOLO_V2_TINY__INFERENCE_ENGINE_TVM_CONFIG_HPP_ +#ifndef COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__YOLO_V2_TINY__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT +#define COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__YOLO_V2_TINY__INFERENCE_ENGINE_TVM_CONFIG_HPP_ namespace model_zoo { @@ -52,5 +52,5 @@ static const tvm_utility::pipeline::InferenceEngineTVMConfig config{ } // namespace camera_obstacle_detection } // namespace perception } // namespace model_zoo -#endif // COMMON__TVM_UTILITY__DATA__MODELS__YOLO_V2_TINY__INFERENCE_ENGINE_TVM_CONFIG_HPP_ +#endif // COMMON__AUTOWARE_TVM_UTILITY__DATA__MODELS__YOLO_V2_TINY__INFERENCE_ENGINE_TVM_CONFIG_HPP_ // NOLINT diff --git a/common/tvm_utility/example/yolo_v2_tiny/main.cpp b/common/autoware_tvm_utility/example/yolo_v2_tiny/main.cpp similarity index 99% rename from common/tvm_utility/example/yolo_v2_tiny/main.cpp rename to common/autoware_tvm_utility/example/yolo_v2_tiny/main.cpp index 38b3355ca38ba..229a843826793 100644 --- a/common/tvm_utility/example/yolo_v2_tiny/main.cpp +++ b/common/autoware_tvm_utility/example/yolo_v2_tiny/main.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "tvm_utility/pipeline.hpp" +#include "autoware/tvm_utility/pipeline.hpp" #include "yolo_v2_tiny/inference_engine_tvm_config.hpp" #include @@ -27,7 +27,7 @@ using model_zoo::perception::camera_obstacle_detection::yolo_v2_tiny::tensorflow_fp32_coco::config; -namespace tvm_utility +namespace autoware::tvm_utility { namespace yolo_v2_tiny { @@ -233,7 +233,7 @@ class PostProcessorYoloV2Tiny : public tvm_utility::pipeline::PostProcessor @@ -30,7 +30,7 @@ #include #include -namespace tvm_utility +namespace autoware::tvm_utility { /** @@ -410,5 +410,5 @@ class TowStagePipeline }; } // namespace pipeline -} // namespace tvm_utility -#endif // TVM_UTILITY__PIPELINE_HPP_ +} // namespace autoware::tvm_utility +#endif // AUTOWARE__TVM_UTILITY__PIPELINE_HPP_ diff --git a/common/tvm_utility/launch/yolo_v2_tiny_example.launch.xml b/common/autoware_tvm_utility/launch/yolo_v2_tiny_example.launch.xml similarity index 100% rename from common/tvm_utility/launch/yolo_v2_tiny_example.launch.xml rename to common/autoware_tvm_utility/launch/yolo_v2_tiny_example.launch.xml diff --git a/common/tvm_utility/package.xml b/common/autoware_tvm_utility/package.xml similarity index 97% rename from common/tvm_utility/package.xml rename to common/autoware_tvm_utility/package.xml index c4fbf1c25ac87..fd6b2462e9b0e 100644 --- a/common/tvm_utility/package.xml +++ b/common/autoware_tvm_utility/package.xml @@ -17,7 +17,7 @@ - tvm_utility + autoware_tvm_utility 1.0.0 A set of utility functions to help build a machine learning pipeline using diff --git a/common/tvm_utility/schema/yolo_v2_tiny_example.schema.json b/common/autoware_tvm_utility/schema/yolo_v2_tiny_example.schema.json similarity index 100% rename from common/tvm_utility/schema/yolo_v2_tiny_example.schema.json rename to common/autoware_tvm_utility/schema/yolo_v2_tiny_example.schema.json diff --git a/common/tvm_utility/test/abs_model/main.cpp b/common/autoware_tvm_utility/test/abs_model/main.cpp similarity index 97% rename from common/tvm_utility/test/abs_model/main.cpp rename to common/autoware_tvm_utility/test/abs_model/main.cpp index 4bf1a69c0556b..b1ff42e75ad7c 100644 --- a/common/tvm_utility/test/abs_model/main.cpp +++ b/common/autoware_tvm_utility/test/abs_model/main.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "autoware/tvm_utility/pipeline.hpp" #include "gtest/gtest.h" -#include "tvm_utility/pipeline.hpp" // file for current arch x86 or arm is chosen in cmake file #include #include @@ -26,7 +26,7 @@ using model_zoo::inf_test::engine_load::abs_model::config; -namespace tvm_utility +namespace autoware::tvm_utility { namespace abs_model { @@ -143,4 +143,4 @@ TEST(PipelineExamples, SimplePipeline) } } // namespace abs_model -} // namespace tvm_utility +} // namespace autoware::tvm_utility diff --git a/common/tvm_utility/tvm-utility-yolo-v2-tiny-tests.md b/common/autoware_tvm_utility/tvm-utility-yolo-v2-tiny-tests.md similarity index 100% rename from common/tvm_utility/tvm-utility-yolo-v2-tiny-tests.md rename to common/autoware_tvm_utility/tvm-utility-yolo-v2-tiny-tests.md