Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(tvm_utility) prefix package and namespace with autoware #9241

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ common/autoware_signal_processing/** [email protected] [email protected]
common/autoware_test_utils/** [email protected] [email protected] [email protected] [email protected]
common/autoware_testing/** [email protected] [email protected] [email protected] [email protected]
common/autoware_time_utils/** [email protected] [email protected] [email protected]
common/autoware_tvm_utility/** [email protected] [email protected]
common/autoware_universe_utils/** [email protected] [email protected] [email protected]
common/autoware_vehicle_info_utils/** [email protected] [email protected] [email protected] [email protected]
common/bag_time_manager_rviz_plugin/** [email protected]
Expand All @@ -41,7 +42,6 @@ common/tier4_traffic_light_rviz_plugin/** [email protected]
common/tier4_vehicle_rviz_plugin/** [email protected]
common/traffic_light_recognition_marker_publisher/** [email protected] [email protected] [email protected]
common/traffic_light_utils/** [email protected] [email protected] [email protected]
common/tvm_utility/** [email protected] [email protected]
control/autoware_autonomous_emergency_braking/** [email protected] [email protected] [email protected] [email protected] [email protected]
control/autoware_collision_detector/** [email protected] [email protected] [email protected]
control/autoware_control_validator/** [email protected] [email protected] [email protected] [email protected] [email protected]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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"
)
Expand Down Expand Up @@ -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"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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 <opencv2/opencv.hpp>
Expand All @@ -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
{
Expand Down Expand Up @@ -233,7 +233,7 @@ class PostProcessorYoloV2Tiny : public tvm_utility::pipeline::PostProcessor<std:
};

} // namespace yolo_v2_tiny
} // namespace tvm_utility
} // namespace autoware::tvm_utility

bool check_near(double expected, double actual, double tolerance)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef TVM_UTILITY__PIPELINE_HPP_
#define TVM_UTILITY__PIPELINE_HPP_
#ifndef AUTOWARE__TVM_UTILITY__PIPELINE_HPP_
#define AUTOWARE__TVM_UTILITY__PIPELINE_HPP_

#include <ament_index_cpp/get_package_share_directory.hpp>

Expand All @@ -30,7 +30,7 @@
#include <utility>
#include <vector>

namespace tvm_utility
namespace autoware::tvm_utility
{

/**
Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!DOCTYPE xml>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>tvm_utility</name>
<name>autoware_tvm_utility</name>
<version>1.0.0</version>
<description>
A set of utility functions to help build a machine learning pipeline using
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <inference_engine_tvm_config.hpp>
#include <opencv2/opencv.hpp>
Expand All @@ -26,7 +26,7 @@

using model_zoo::inf_test::engine_load::abs_model::config;

namespace tvm_utility
namespace autoware::tvm_utility
{
namespace abs_model
{
Expand Down Expand Up @@ -143,4 +143,4 @@ TEST(PipelineExamples, SimplePipeline)
}

} // namespace abs_model
} // namespace tvm_utility
} // namespace autoware::tvm_utility
Loading