diff --git a/CMakeLists.txt b/CMakeLists.txt index ef4d86d9a9..3aa3d54937 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ endif () # at function definition include(cmake/MMDeploy.cmake) -add_subdirectory(csrc) +add_subdirectory(csrc/mmdeploy) if (MMDEPLOY_BUILD_SDK) install(TARGETS MMDeployStaticModules @@ -87,7 +87,7 @@ if (MMDEPLOY_BUILD_SDK) endif () if (MMDEPLOY_BUILD_SDK_PYTHON_API) - add_subdirectory(csrc/apis/python) + add_subdirectory(csrc/mmdeploy/apis/python) endif () # export MMDeploy package diff --git a/csrc/CMakeLists.txt b/csrc/mmdeploy/CMakeLists.txt similarity index 100% rename from csrc/CMakeLists.txt rename to csrc/mmdeploy/CMakeLists.txt diff --git a/csrc/apis/c/CMakeLists.txt b/csrc/mmdeploy/apis/c/CMakeLists.txt similarity index 87% rename from csrc/apis/c/CMakeLists.txt rename to csrc/mmdeploy/apis/c/CMakeLists.txt index 71e8b27a83..0ff02d4a70 100644 --- a/csrc/apis/c/CMakeLists.txt +++ b/csrc/mmdeploy/apis/c/CMakeLists.txt @@ -50,10 +50,9 @@ foreach (TASK ${COMMON_LIST}) mmdeploy_add_library(${TARGET_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TASK}.cpp) target_link_libraries(${TARGET_NAME} PRIVATE mmdeploy::core) target_include_directories(${TARGET_NAME} PUBLIC - $ - $) + $) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${TASK}.h - DESTINATION include/c) + DESTINATION include/mmdeploy/apis/c) endforeach () target_link_libraries(mmdeploy_executor PUBLIC @@ -68,15 +67,11 @@ foreach (TASK ${TASK_LIST}) target_link_libraries(${TARGET_NAME} PRIVATE mmdeploy_pipeline mmdeploy::core) target_include_directories(${TARGET_NAME} PUBLIC - $ - $) + $) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${TASK}.h - DESTINATION include/c) + DESTINATION include/mmdeploy/apis/c) endforeach () -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/common.h - DESTINATION include/c) - if (MMDEPLOY_BUILD_SDK_CSHARP_API) # build MMDeployExtern.dll just for csharp nuget package. # no Installation for c/c++ package. @@ -86,4 +81,4 @@ if (MMDEPLOY_BUILD_SDK_CSHARP_API) mmdeploy_load_static(MMDeployExtern MMDeployStaticModules) mmdeploy_load_dynamic(MMDeployExtern MMDeployDynamicModules) target_link_libraries(MMDeployExtern PRIVATE MMDeployLibs) -endif() +endif () diff --git a/csrc/apis/c/classifier.cpp b/csrc/mmdeploy/apis/c/classifier.cpp similarity index 93% rename from csrc/apis/c/classifier.cpp rename to csrc/mmdeploy/apis/c/classifier.cpp index a60cceb6ed..7ad9df229f 100644 --- a/csrc/apis/c/classifier.cpp +++ b/csrc/mmdeploy/apis/c/classifier.cpp @@ -4,14 +4,14 @@ #include -#include "apis/c/common_internal.h" -#include "apis/c/handle.h" -#include "apis/c/pipeline.h" -#include "archive/value_archive.h" -#include "codebase/mmcls/mmcls.h" -#include "core/device.h" -#include "core/graph.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/handle.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/codebase/mmcls/mmcls.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/utils/formatter.h" using namespace mmdeploy; using namespace std; diff --git a/csrc/apis/c/classifier.h b/csrc/mmdeploy/apis/c/classifier.h similarity index 100% rename from csrc/apis/c/classifier.h rename to csrc/mmdeploy/apis/c/classifier.h diff --git a/csrc/apis/c/common.cpp b/csrc/mmdeploy/apis/c/common.cpp similarity index 90% rename from csrc/apis/c/common.cpp rename to csrc/mmdeploy/apis/c/common.cpp index 39befacca8..5e7d6e224e 100644 --- a/csrc/apis/c/common.cpp +++ b/csrc/mmdeploy/apis/c/common.cpp @@ -1,8 +1,8 @@ #include "common.h" -#include "apis/c/common_internal.h" -#include "apis/c/handle.h" -#include "core/mat.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/handle.h" +#include "mmdeploy/core/mat.h" mmdeploy_value_t mmdeploy_value_copy(mmdeploy_value_t input) { if (!input) { diff --git a/csrc/apis/c/common.h b/csrc/mmdeploy/apis/c/common.h similarity index 100% rename from csrc/apis/c/common.h rename to csrc/mmdeploy/apis/c/common.h diff --git a/csrc/apis/c/common_internal.h b/csrc/mmdeploy/apis/c/common_internal.h similarity index 94% rename from csrc/apis/c/common_internal.h rename to csrc/mmdeploy/apis/c/common_internal.h index c5a41b308f..2ef9eb00e6 100644 --- a/csrc/apis/c/common_internal.h +++ b/csrc/mmdeploy/apis/c/common_internal.h @@ -3,9 +3,9 @@ #ifndef MMDEPLOY_CSRC_APIS_C_COMMON_INTERNAL_H_ #define MMDEPLOY_CSRC_APIS_C_COMMON_INTERNAL_H_ -#include "apis/c/common.h" -#include "apis/c/model.h" -#include "core/value.h" +#include "mmdeploy/apis/c/common.h" +#include "mmdeploy/apis/c/model.h" +#include "mmdeploy/core/value.h" using namespace mmdeploy; diff --git a/csrc/apis/c/detector.cpp b/csrc/mmdeploy/apis/c/detector.cpp similarity index 93% rename from csrc/apis/c/detector.cpp rename to csrc/mmdeploy/apis/c/detector.cpp index 3ae6af3986..7a7a5bc37a 100644 --- a/csrc/apis/c/detector.cpp +++ b/csrc/mmdeploy/apis/c/detector.cpp @@ -4,16 +4,16 @@ #include -#include "apis/c/common_internal.h" -#include "apis/c/executor_internal.h" -#include "apis/c/model.h" -#include "apis/c/pipeline.h" -#include "archive/value_archive.h" -#include "codebase/mmdet/mmdet.h" -#include "core/device.h" -#include "core/model.h" -#include "core/utils/formatter.h" -#include "core/value.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/executor_internal.h" +#include "mmdeploy/apis/c/model.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/codebase/mmdet/mmdet.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" using namespace std; using namespace mmdeploy; diff --git a/csrc/apis/c/detector.h b/csrc/mmdeploy/apis/c/detector.h similarity index 100% rename from csrc/apis/c/detector.h rename to csrc/mmdeploy/apis/c/detector.h diff --git a/csrc/apis/c/executor.cpp b/csrc/mmdeploy/apis/c/executor.cpp similarity index 98% rename from csrc/apis/c/executor.cpp rename to csrc/mmdeploy/apis/c/executor.cpp index c816677550..2ff240391c 100644 --- a/csrc/apis/c/executor.cpp +++ b/csrc/mmdeploy/apis/c/executor.cpp @@ -1,11 +1,11 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "apis/c/executor.h" +#include "mmdeploy/apis/c/executor.h" #include "common.h" #include "common_internal.h" -#include "execution/when_all_value.h" #include "executor_internal.h" +#include "mmdeploy/execution/when_all_value.h" using namespace mmdeploy; diff --git a/csrc/apis/c/executor.h b/csrc/mmdeploy/apis/c/executor.h similarity index 100% rename from csrc/apis/c/executor.h rename to csrc/mmdeploy/apis/c/executor.h diff --git a/csrc/apis/c/executor_internal.h b/csrc/mmdeploy/apis/c/executor_internal.h similarity index 95% rename from csrc/apis/c/executor_internal.h rename to csrc/mmdeploy/apis/c/executor_internal.h index df2b11bd96..c1a5c94526 100644 --- a/csrc/apis/c/executor_internal.h +++ b/csrc/mmdeploy/apis/c/executor_internal.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_CSRC_APIS_C_EXECUTOR_INTERNAL_H_ #define MMDEPLOY_CSRC_APIS_C_EXECUTOR_INTERNAL_H_ -#include "execution/schedulers/registry.h" #include "executor.h" +#include "mmdeploy/execution/schedulers/registry.h" using namespace mmdeploy; diff --git a/csrc/apis/c/handle.h b/csrc/mmdeploy/apis/c/handle.h similarity index 89% rename from csrc/apis/c/handle.h rename to csrc/mmdeploy/apis/c/handle.h index a537ea4f36..379bc615fe 100644 --- a/csrc/apis/c/handle.h +++ b/csrc/mmdeploy/apis/c/handle.h @@ -5,10 +5,10 @@ #include -#include "core/device.h" -#include "core/graph.h" -#include "core/value.h" -#include "graph/pipeline.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/graph/pipeline.h" namespace mmdeploy { diff --git a/csrc/apis/c/model.cpp b/csrc/mmdeploy/apis/c/model.cpp similarity index 93% rename from csrc/apis/c/model.cpp rename to csrc/mmdeploy/apis/c/model.cpp index 5101b92a47..75c1eca1ff 100644 --- a/csrc/apis/c/model.cpp +++ b/csrc/mmdeploy/apis/c/model.cpp @@ -5,8 +5,8 @@ #include -#include "core/logger.h" -#include "core/model.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" // clang-format on using namespace mmdeploy; diff --git a/csrc/apis/c/model.h b/csrc/mmdeploy/apis/c/model.h similarity index 100% rename from csrc/apis/c/model.h rename to csrc/mmdeploy/apis/c/model.h diff --git a/csrc/apis/c/pipeline.cpp b/csrc/mmdeploy/apis/c/pipeline.cpp similarity index 93% rename from csrc/apis/c/pipeline.cpp rename to csrc/mmdeploy/apis/c/pipeline.cpp index 79b6bb9437..b7ba22ea6f 100644 --- a/csrc/apis/c/pipeline.cpp +++ b/csrc/mmdeploy/apis/c/pipeline.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "apis/c/pipeline.h" +#include "pipeline.h" -#include "apis/c/common_internal.h" -#include "apis/c/executor_internal.h" -#include "apis/c/handle.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/executor_internal.h" +#include "mmdeploy/apis/c/handle.h" int mmdeploy_pipeline_create(mmdeploy_value_t config, const char* device_name, int device_id, mmdeploy_exec_info_t exec_info, mm_handle_t* handle) { diff --git a/csrc/apis/c/pipeline.h b/csrc/mmdeploy/apis/c/pipeline.h similarity index 100% rename from csrc/apis/c/pipeline.h rename to csrc/mmdeploy/apis/c/pipeline.h diff --git a/csrc/apis/c/pose_detector.cpp b/csrc/mmdeploy/apis/c/pose_detector.cpp similarity index 96% rename from csrc/apis/c/pose_detector.cpp rename to csrc/mmdeploy/apis/c/pose_detector.cpp index 9339c26746..0725e7c669 100644 --- a/csrc/apis/c/pose_detector.cpp +++ b/csrc/mmdeploy/apis/c/pose_detector.cpp @@ -4,14 +4,14 @@ #include -#include "apis/c/common_internal.h" -#include "apis/c/handle.h" -#include "apis/c/pipeline.h" -#include "codebase/mmpose/mmpose.h" -#include "core/device.h" -#include "core/graph.h" -#include "core/mat.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/handle.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/codebase/mmpose/mmpose.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/utils/formatter.h" using namespace std; using namespace mmdeploy; diff --git a/csrc/apis/c/pose_detector.h b/csrc/mmdeploy/apis/c/pose_detector.h similarity index 100% rename from csrc/apis/c/pose_detector.h rename to csrc/mmdeploy/apis/c/pose_detector.h diff --git a/csrc/apis/c/restorer.cpp b/csrc/mmdeploy/apis/c/restorer.cpp similarity index 93% rename from csrc/apis/c/restorer.cpp rename to csrc/mmdeploy/apis/c/restorer.cpp index c58dc9175c..77b21e300a 100644 --- a/csrc/apis/c/restorer.cpp +++ b/csrc/mmdeploy/apis/c/restorer.cpp @@ -2,14 +2,14 @@ #include "restorer.h" -#include "apis/c/common_internal.h" -#include "apis/c/executor_internal.h" -#include "apis/c/handle.h" -#include "apis/c/pipeline.h" -#include "codebase/mmedit/mmedit.h" -#include "core/device.h" -#include "core/graph.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/executor_internal.h" +#include "mmdeploy/apis/c/handle.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/codebase/mmedit/mmedit.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/utils/formatter.h" using namespace mmdeploy; diff --git a/csrc/apis/c/restorer.h b/csrc/mmdeploy/apis/c/restorer.h similarity index 100% rename from csrc/apis/c/restorer.h rename to csrc/mmdeploy/apis/c/restorer.h diff --git a/csrc/apis/c/rotated_detector.cpp b/csrc/mmdeploy/apis/c/rotated_detector.cpp similarity index 95% rename from csrc/apis/c/rotated_detector.cpp rename to csrc/mmdeploy/apis/c/rotated_detector.cpp index ec22450c05..fd5f4c9e44 100644 --- a/csrc/apis/c/rotated_detector.cpp +++ b/csrc/mmdeploy/apis/c/rotated_detector.cpp @@ -4,13 +4,13 @@ #include -#include "apis/c/common_internal.h" -#include "apis/c/handle.h" -#include "apis/c/pipeline.h" -#include "codebase/mmrotate/mmrotate.h" -#include "core/graph.h" -#include "core/mat.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/handle.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/codebase/mmrotate/mmrotate.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/utils/formatter.h" using namespace std; using namespace mmdeploy; diff --git a/csrc/apis/c/rotated_detector.h b/csrc/mmdeploy/apis/c/rotated_detector.h similarity index 100% rename from csrc/apis/c/rotated_detector.h rename to csrc/mmdeploy/apis/c/rotated_detector.h diff --git a/csrc/apis/c/segmentor.cpp b/csrc/mmdeploy/apis/c/segmentor.cpp similarity index 92% rename from csrc/apis/c/segmentor.cpp rename to csrc/mmdeploy/apis/c/segmentor.cpp index ed130c4a99..9ee4cdc9a7 100644 --- a/csrc/apis/c/segmentor.cpp +++ b/csrc/mmdeploy/apis/c/segmentor.cpp @@ -1,16 +1,16 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "apis/c/segmentor.h" - -#include "apis/c/common_internal.h" -#include "apis/c/handle.h" -#include "apis/c/pipeline.h" -#include "codebase/mmseg/mmseg.h" -#include "core/device.h" -#include "core/graph.h" -#include "core/mat.h" -#include "core/tensor.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/segmentor.h" + +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/handle.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/codebase/mmseg/mmseg.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/formatter.h" using namespace std; using namespace mmdeploy; diff --git a/csrc/apis/c/segmentor.h b/csrc/mmdeploy/apis/c/segmentor.h similarity index 100% rename from csrc/apis/c/segmentor.h rename to csrc/mmdeploy/apis/c/segmentor.h diff --git a/csrc/apis/c/text_detector.cpp b/csrc/mmdeploy/apis/c/text_detector.cpp similarity index 95% rename from csrc/apis/c/text_detector.cpp rename to csrc/mmdeploy/apis/c/text_detector.cpp index 43f96c8506..cc567b9181 100644 --- a/csrc/apis/c/text_detector.cpp +++ b/csrc/mmdeploy/apis/c/text_detector.cpp @@ -4,14 +4,14 @@ #include -#include "apis/c/common_internal.h" -#include "apis/c/executor_internal.h" -#include "apis/c/model.h" -#include "apis/c/pipeline.h" -#include "codebase/mmocr/mmocr.h" -#include "core/model.h" -#include "core/status_code.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/executor_internal.h" +#include "mmdeploy/apis/c/model.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/status_code.h" +#include "mmdeploy/core/utils/formatter.h" using namespace std; using namespace mmdeploy; diff --git a/csrc/apis/c/text_detector.h b/csrc/mmdeploy/apis/c/text_detector.h similarity index 100% rename from csrc/apis/c/text_detector.h rename to csrc/mmdeploy/apis/c/text_detector.h diff --git a/csrc/apis/c/text_recognizer.cpp b/csrc/mmdeploy/apis/c/text_recognizer.cpp similarity index 95% rename from csrc/apis/c/text_recognizer.cpp rename to csrc/mmdeploy/apis/c/text_recognizer.cpp index 1c68030fef..71b83c25f3 100644 --- a/csrc/apis/c/text_recognizer.cpp +++ b/csrc/mmdeploy/apis/c/text_recognizer.cpp @@ -4,18 +4,18 @@ #include -#include "apis/c/common_internal.h" -#include "apis/c/executor_internal.h" -#include "apis/c/model.h" -#include "apis/c/pipeline.h" -#include "archive/value_archive.h" -#include "codebase/mmocr/mmocr.h" -#include "core/device.h" -#include "core/mat.h" -#include "core/model.h" -#include "core/status_code.h" -#include "core/utils/formatter.h" -#include "core/value.h" +#include "mmdeploy/apis/c/common_internal.h" +#include "mmdeploy/apis/c/executor_internal.h" +#include "mmdeploy/apis/c/model.h" +#include "mmdeploy/apis/c/pipeline.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/status_code.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" using namespace mmdeploy; diff --git a/csrc/apis/c/text_recognizer.h b/csrc/mmdeploy/apis/c/text_recognizer.h similarity index 100% rename from csrc/apis/c/text_recognizer.h rename to csrc/mmdeploy/apis/c/text_recognizer.h diff --git a/csrc/apis/csharp/MMDeploy.sln b/csrc/mmdeploy/apis/csharp/MMDeploy.sln similarity index 100% rename from csrc/apis/csharp/MMDeploy.sln rename to csrc/mmdeploy/apis/csharp/MMDeploy.sln diff --git a/csrc/apis/csharp/MMDeploy/.editorconfig b/csrc/mmdeploy/apis/csharp/MMDeploy/.editorconfig similarity index 100% rename from csrc/apis/csharp/MMDeploy/.editorconfig rename to csrc/mmdeploy/apis/csharp/MMDeploy/.editorconfig diff --git a/csrc/apis/csharp/MMDeploy/APIs/Classifier.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Classifier.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/Classifier.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Classifier.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/Detector.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Detector.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/Detector.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Detector.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/DisposableObject.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/DisposableObject.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/DisposableObject.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/DisposableObject.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/PoseDetector.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/PoseDetector.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/PoseDetector.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/PoseDetector.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/Restorer.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Restorer.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/Restorer.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Restorer.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/Segmentor.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Segmentor.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/Segmentor.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/Segmentor.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/TextDetector.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/TextDetector.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/TextDetector.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/TextDetector.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/TextRecognizer.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/TextRecognizer.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/TextRecognizer.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/TextRecognizer.cs diff --git a/csrc/apis/csharp/MMDeploy/APIs/common.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/APIs/common.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/APIs/common.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/APIs/common.cs diff --git a/csrc/apis/csharp/MMDeploy/MMDeploy.csproj b/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeploy.csproj similarity index 100% rename from csrc/apis/csharp/MMDeploy/MMDeploy.csproj rename to csrc/mmdeploy/apis/csharp/MMDeploy/MMDeploy.csproj diff --git a/csrc/apis/csharp/MMDeploy/NativeAPIs/NativeMethods.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/NativeAPIs/NativeMethods.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/NativeAPIs/NativeMethods.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/NativeAPIs/NativeMethods.cs diff --git a/csrc/apis/csharp/MMDeploy/NativeAPIs/NativeMethods_c_api.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/NativeAPIs/NativeMethods_c_api.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/NativeAPIs/NativeMethods_c_api.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/NativeAPIs/NativeMethods_c_api.cs diff --git a/csrc/apis/csharp/MMDeploy/Properties/AssemblyInfo.cs b/csrc/mmdeploy/apis/csharp/MMDeploy/Properties/AssemblyInfo.cs similarity index 100% rename from csrc/apis/csharp/MMDeploy/Properties/AssemblyInfo.cs rename to csrc/mmdeploy/apis/csharp/MMDeploy/Properties/AssemblyInfo.cs diff --git a/csrc/apis/csharp/README.md b/csrc/mmdeploy/apis/csharp/README.md similarity index 100% rename from csrc/apis/csharp/README.md rename to csrc/mmdeploy/apis/csharp/README.md diff --git a/csrc/apis/python/CMakeLists.txt b/csrc/mmdeploy/apis/python/CMakeLists.txt similarity index 94% rename from csrc/apis/python/CMakeLists.txt rename to csrc/mmdeploy/apis/python/CMakeLists.txt index 6efc07bd7b..0f579614de 100644 --- a/csrc/apis/python/CMakeLists.txt +++ b/csrc/mmdeploy/apis/python/CMakeLists.txt @@ -8,7 +8,7 @@ set(MMDEPLOY_PYTHON_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/common.cpp) set(CMAKE_CXX_STANDARD 17) if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME}) - add_subdirectory(${CMAKE_SOURCE_DIR}/../../../third_party/pybind11 + add_subdirectory(${CMAKE_SOURCE_DIR}/../../../../third_party/pybind11 ${CMAKE_CURRENT_BINARY_DIR}/pybind11) find_package(MMDeploy REQUIRED) elseif (NOT TARGET pybind11) diff --git a/csrc/apis/python/classifier.cpp b/csrc/mmdeploy/apis/python/classifier.cpp similarity index 98% rename from csrc/apis/python/classifier.cpp rename to csrc/mmdeploy/apis/python/classifier.cpp index 88f27e6e9e..1290807742 100644 --- a/csrc/apis/python/classifier.cpp +++ b/csrc/mmdeploy/apis/python/classifier.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "classifier.h" +#include "mmdeploy/apis/c/classifier.h" #include "common.h" diff --git a/csrc/apis/python/common.cpp b/csrc/mmdeploy/apis/python/common.cpp similarity index 100% rename from csrc/apis/python/common.cpp rename to csrc/mmdeploy/apis/python/common.cpp diff --git a/csrc/apis/python/common.h b/csrc/mmdeploy/apis/python/common.h similarity index 94% rename from csrc/apis/python/common.h rename to csrc/mmdeploy/apis/python/common.h index 981b7a1904..cd4e85cfa2 100644 --- a/csrc/apis/python/common.h +++ b/csrc/mmdeploy/apis/python/common.h @@ -5,7 +5,7 @@ #include -#include "c/common.h" +#include "mmdeploy/apis/c/common.h" #include "pybind11/numpy.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" diff --git a/csrc/apis/python/detector.cpp b/csrc/mmdeploy/apis/python/detector.cpp similarity index 98% rename from csrc/apis/python/detector.cpp rename to csrc/mmdeploy/apis/python/detector.cpp index 1821cd2af5..fb197d4287 100644 --- a/csrc/apis/python/detector.cpp +++ b/csrc/mmdeploy/apis/python/detector.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "detector.h" +#include "mmdeploy/apis/c/detector.h" #include "common.h" diff --git a/csrc/apis/python/executor.cpp b/csrc/mmdeploy/apis/python/executor.cpp similarity index 82% rename from csrc/apis/python/executor.cpp rename to csrc/mmdeploy/apis/python/executor.cpp index 275cc64208..9c7de4f42e 100644 --- a/csrc/apis/python/executor.cpp +++ b/csrc/mmdeploy/apis/python/executor.cpp @@ -1,12 +1,12 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "common.h" -#include "core/utils/formatter.h" -#include "execution/execution.h" -#include "execution/schedulers/inlined_scheduler.h" -#include "execution/schedulers/registry.h" -#include "execution/schedulers/single_thread_context.h" -#include "execution/schedulers/static_thread_pool.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/execution/execution.h" +#include "mmdeploy/execution/schedulers/inlined_scheduler.h" +#include "mmdeploy/execution/schedulers/registry.h" +#include "mmdeploy/execution/schedulers/single_thread_context.h" +#include "mmdeploy/execution/schedulers/static_thread_pool.h" namespace mmdeploy { diff --git a/csrc/apis/python/pose_detector.cpp b/csrc/mmdeploy/apis/python/pose_detector.cpp similarity index 98% rename from csrc/apis/python/pose_detector.cpp rename to csrc/mmdeploy/apis/python/pose_detector.cpp index cf8de277c4..8fccb1a1f6 100644 --- a/csrc/apis/python/pose_detector.cpp +++ b/csrc/mmdeploy/apis/python/pose_detector.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "pose_detector.h" +#include "mmdeploy/apis/c/pose_detector.h" #include #include diff --git a/csrc/apis/python/restorer.cpp b/csrc/mmdeploy/apis/python/restorer.cpp similarity index 98% rename from csrc/apis/python/restorer.cpp rename to csrc/mmdeploy/apis/python/restorer.cpp index fcbde182be..7abf8dfccb 100644 --- a/csrc/apis/python/restorer.cpp +++ b/csrc/mmdeploy/apis/python/restorer.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "restorer.h" +#include "mmdeploy/apis/c/restorer.h" #include "common.h" diff --git a/csrc/apis/python/rotated_detector.cpp b/csrc/mmdeploy/apis/python/rotated_detector.cpp similarity index 98% rename from csrc/apis/python/rotated_detector.cpp rename to csrc/mmdeploy/apis/python/rotated_detector.cpp index c86d69053b..491d651213 100644 --- a/csrc/apis/python/rotated_detector.cpp +++ b/csrc/mmdeploy/apis/python/rotated_detector.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "rotated_detector.h" +#include "mmdeploy/apis/c/rotated_detector.h" #include "common.h" diff --git a/csrc/apis/python/segmentor.cpp b/csrc/mmdeploy/apis/python/segmentor.cpp similarity index 98% rename from csrc/apis/python/segmentor.cpp rename to csrc/mmdeploy/apis/python/segmentor.cpp index a613d75a9f..a2cae5a97b 100644 --- a/csrc/apis/python/segmentor.cpp +++ b/csrc/mmdeploy/apis/python/segmentor.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "segmentor.h" +#include "mmdeploy/apis/c/segmentor.h" #include "common.h" diff --git a/csrc/apis/python/text_detector.cpp b/csrc/mmdeploy/apis/python/text_detector.cpp similarity index 98% rename from csrc/apis/python/text_detector.cpp rename to csrc/mmdeploy/apis/python/text_detector.cpp index 8d752d3643..52522ef5f2 100644 --- a/csrc/apis/python/text_detector.cpp +++ b/csrc/mmdeploy/apis/python/text_detector.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "text_detector.h" +#include "mmdeploy/apis/c/text_detector.h" #include "common.h" diff --git a/csrc/apis/python/text_recognizer.cpp b/csrc/mmdeploy/apis/python/text_recognizer.cpp similarity index 97% rename from csrc/apis/python/text_recognizer.cpp rename to csrc/mmdeploy/apis/python/text_recognizer.cpp index 142059573e..468058a5cd 100644 --- a/csrc/apis/python/text_recognizer.cpp +++ b/csrc/mmdeploy/apis/python/text_recognizer.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "text_recognizer.h" +#include "mmdeploy/apis/c/text_recognizer.h" #include "common.h" diff --git a/csrc/archive/CMakeLists.txt b/csrc/mmdeploy/archive/CMakeLists.txt similarity index 69% rename from csrc/archive/CMakeLists.txt rename to csrc/mmdeploy/archive/CMakeLists.txt index e5f03565e8..21bb3ae59d 100644 --- a/csrc/archive/CMakeLists.txt +++ b/csrc/mmdeploy/archive/CMakeLists.txt @@ -7,9 +7,9 @@ target_link_libraries(${PROJECT_NAME} INTERFACE mmdeploy::core) add_library(mmdeploy::archive ALIAS mmdeploy_archive) if (MMDEPLOY_BUILD_SDK_CXX_API) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/csrc/archive - DESTINATION include/cpp + install(DIRECTORY ${CMAKE_SOURCE_DIR}/csrc/mmdeploy/archive + DESTINATION include/mmdeploy FILES_MATCHING PATTERN "*.h") install(FILES ${CMAKE_SOURCE_DIR}/third_party/json/json.hpp - DESTINATION include/cpp/archive) + DESTINATION include/mmdeploy/third_party/json) endif () diff --git a/csrc/archive/json_archive.h b/csrc/mmdeploy/archive/json_archive.h similarity index 98% rename from csrc/archive/json_archive.h rename to csrc/mmdeploy/archive/json_archive.h index 6f137b9a7c..2803ee22b2 100644 --- a/csrc/archive/json_archive.h +++ b/csrc/mmdeploy/archive/json_archive.h @@ -3,9 +3,9 @@ #ifndef MMDEPLOY_SRC_ARCHIVE_JSON_ARCHIVE_H_ #define MMDEPLOY_SRC_ARCHIVE_JSON_ARCHIVE_H_ -#include "core/archive.h" -#include "core/value.h" #include "json.hpp" +#include "mmdeploy/core/archive.h" +#include "mmdeploy/core/value.h" namespace mmdeploy { diff --git a/csrc/archive/value_archive.h b/csrc/mmdeploy/archive/value_archive.h similarity index 97% rename from csrc/archive/value_archive.h rename to csrc/mmdeploy/archive/value_archive.h index f4115b3cb0..13cc95cca3 100644 --- a/csrc/archive/value_archive.h +++ b/csrc/mmdeploy/archive/value_archive.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_SRC_ARCHIVE_VALUE_ARCHIVE_H_ #define MMDEPLOY_SRC_ARCHIVE_VALUE_ARCHIVE_H_ -#include "core/archive.h" -#include "core/value.h" +#include "mmdeploy/core/archive.h" +#include "mmdeploy/core/value.h" namespace mmdeploy { diff --git a/csrc/backend_ops/CMakeLists.txt b/csrc/mmdeploy/backend_ops/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/CMakeLists.txt diff --git a/csrc/backend_ops/common/modulated_deform_conv/common_cuda_helper.cuh b/csrc/mmdeploy/backend_ops/common/modulated_deform_conv/common_cuda_helper.cuh similarity index 100% rename from csrc/backend_ops/common/modulated_deform_conv/common_cuda_helper.cuh rename to csrc/mmdeploy/backend_ops/common/modulated_deform_conv/common_cuda_helper.cuh diff --git a/csrc/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cpu.h b/csrc/mmdeploy/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cpu.h similarity index 100% rename from csrc/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cpu.h rename to csrc/mmdeploy/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cpu.h diff --git a/csrc/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cuda.cuh b/csrc/mmdeploy/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cuda.cuh similarity index 100% rename from csrc/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cuda.cuh rename to csrc/mmdeploy/backend_ops/common/modulated_deform_conv/modulated_deform_conv_cuda.cuh diff --git a/csrc/backend_ops/ncnn/CMakeLists.txt b/csrc/mmdeploy/backend_ops/ncnn/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/ncnn/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/ncnn/CMakeLists.txt diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/CMakeLists.txt b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/CMakeLists.txt diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/fuse_pass.cpp b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/fuse_pass.cpp similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/fuse_pass.cpp rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/fuse_pass.cpp diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/fuse_pass.h b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/fuse_pass.h similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/fuse_pass.h rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/fuse_pass.h diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/onnx.proto b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/onnx.proto similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/onnx.proto rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/onnx.proto diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/onnx2ncnn.cpp b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/onnx2ncnn.cpp similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/onnx2ncnn.cpp rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/onnx2ncnn.cpp diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/shape_inference.cpp b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/shape_inference.cpp similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/shape_inference.cpp rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/shape_inference.cpp diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/shape_inference.h b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/shape_inference.h similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/shape_inference.h rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/shape_inference.h diff --git a/csrc/backend_ops/ncnn/onnx2ncnn/utils.h b/csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/utils.h similarity index 100% rename from csrc/backend_ops/ncnn/onnx2ncnn/utils.h rename to csrc/mmdeploy/backend_ops/ncnn/onnx2ncnn/utils.h diff --git a/csrc/backend_ops/ncnn/ops/CMakeLists.txt b/csrc/mmdeploy/backend_ops/ncnn/ops/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/ncnn/ops/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/ncnn/ops/CMakeLists.txt diff --git a/csrc/backend_ops/ncnn/ops/constantofshape/constantofshape.cpp b/csrc/mmdeploy/backend_ops/ncnn/ops/constantofshape/constantofshape.cpp similarity index 100% rename from csrc/backend_ops/ncnn/ops/constantofshape/constantofshape.cpp rename to csrc/mmdeploy/backend_ops/ncnn/ops/constantofshape/constantofshape.cpp diff --git a/csrc/backend_ops/ncnn/ops/constantofshape/constantofshape.h b/csrc/mmdeploy/backend_ops/ncnn/ops/constantofshape/constantofshape.h similarity index 100% rename from csrc/backend_ops/ncnn/ops/constantofshape/constantofshape.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/constantofshape/constantofshape.h diff --git a/csrc/backend_ops/ncnn/ops/expand/expand.cpp b/csrc/mmdeploy/backend_ops/ncnn/ops/expand/expand.cpp similarity index 100% rename from csrc/backend_ops/ncnn/ops/expand/expand.cpp rename to csrc/mmdeploy/backend_ops/ncnn/ops/expand/expand.cpp diff --git a/csrc/backend_ops/ncnn/ops/expand/expand.h b/csrc/mmdeploy/backend_ops/ncnn/ops/expand/expand.h similarity index 100% rename from csrc/backend_ops/ncnn/ops/expand/expand.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/expand/expand.h diff --git a/csrc/backend_ops/ncnn/ops/gather/gather.cpp b/csrc/mmdeploy/backend_ops/ncnn/ops/gather/gather.cpp similarity index 100% rename from csrc/backend_ops/ncnn/ops/gather/gather.cpp rename to csrc/mmdeploy/backend_ops/ncnn/ops/gather/gather.cpp diff --git a/csrc/backend_ops/ncnn/ops/gather/gather.h b/csrc/mmdeploy/backend_ops/ncnn/ops/gather/gather.h similarity index 100% rename from csrc/backend_ops/ncnn/ops/gather/gather.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/gather/gather.h diff --git a/csrc/backend_ops/ncnn/ops/ncnn_ops_definer.h b/csrc/mmdeploy/backend_ops/ncnn/ops/ncnn_ops_definer.h similarity index 100% rename from csrc/backend_ops/ncnn/ops/ncnn_ops_definer.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/ncnn_ops_definer.h diff --git a/csrc/backend_ops/ncnn/ops/ncnn_ops_register.cpp b/csrc/mmdeploy/backend_ops/ncnn/ops/ncnn_ops_register.cpp similarity index 100% rename from csrc/backend_ops/ncnn/ops/ncnn_ops_register.cpp rename to csrc/mmdeploy/backend_ops/ncnn/ops/ncnn_ops_register.cpp diff --git a/csrc/backend_ops/ncnn/ops/ncnn_ops_register.h b/csrc/mmdeploy/backend_ops/ncnn/ops/ncnn_ops_register.h similarity index 92% rename from csrc/backend_ops/ncnn/ops/ncnn_ops_register.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/ncnn_ops_register.h index 333f174e79..0d9974f783 100755 --- a/csrc/backend_ops/ncnn/ops/ncnn_ops_register.h +++ b/csrc/mmdeploy/backend_ops/ncnn/ops/ncnn_ops_register.h @@ -5,7 +5,7 @@ #include #include -#include "core/macro.h" +#include "mmdeploy/core/macro.h" #include "net.h" MMDEPLOY_API std::map& get_mmdeploy_layer_creator(); diff --git a/csrc/backend_ops/ncnn/ops/shape/shape.cpp b/csrc/mmdeploy/backend_ops/ncnn/ops/shape/shape.cpp similarity index 100% rename from csrc/backend_ops/ncnn/ops/shape/shape.cpp rename to csrc/mmdeploy/backend_ops/ncnn/ops/shape/shape.cpp diff --git a/csrc/backend_ops/ncnn/ops/shape/shape.h b/csrc/mmdeploy/backend_ops/ncnn/ops/shape/shape.h similarity index 100% rename from csrc/backend_ops/ncnn/ops/shape/shape.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/shape/shape.h diff --git a/csrc/backend_ops/ncnn/ops/tensorslice/tensorslice.cpp b/csrc/mmdeploy/backend_ops/ncnn/ops/tensorslice/tensorslice.cpp similarity index 100% rename from csrc/backend_ops/ncnn/ops/tensorslice/tensorslice.cpp rename to csrc/mmdeploy/backend_ops/ncnn/ops/tensorslice/tensorslice.cpp diff --git a/csrc/backend_ops/ncnn/ops/tensorslice/tensorslice.h b/csrc/mmdeploy/backend_ops/ncnn/ops/tensorslice/tensorslice.h similarity index 100% rename from csrc/backend_ops/ncnn/ops/tensorslice/tensorslice.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/tensorslice/tensorslice.h diff --git a/csrc/backend_ops/ncnn/ops/topk/topk.cpp b/csrc/mmdeploy/backend_ops/ncnn/ops/topk/topk.cpp similarity index 100% rename from csrc/backend_ops/ncnn/ops/topk/topk.cpp rename to csrc/mmdeploy/backend_ops/ncnn/ops/topk/topk.cpp diff --git a/csrc/backend_ops/ncnn/ops/topk/topk.h b/csrc/mmdeploy/backend_ops/ncnn/ops/topk/topk.h similarity index 100% rename from csrc/backend_ops/ncnn/ops/topk/topk.h rename to csrc/mmdeploy/backend_ops/ncnn/ops/topk/topk.h diff --git a/csrc/backend_ops/ncnn/pyncnn_ext/CMakeLists.txt b/csrc/mmdeploy/backend_ops/ncnn/pyncnn_ext/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/ncnn/pyncnn_ext/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/ncnn/pyncnn_ext/CMakeLists.txt diff --git a/csrc/backend_ops/ncnn/pyncnn_ext/ncnn_ext.cpp b/csrc/mmdeploy/backend_ops/ncnn/pyncnn_ext/ncnn_ext.cpp similarity index 100% rename from csrc/backend_ops/ncnn/pyncnn_ext/ncnn_ext.cpp rename to csrc/mmdeploy/backend_ops/ncnn/pyncnn_ext/ncnn_ext.cpp diff --git a/csrc/backend_ops/onnxruntime/CMakeLists.txt b/csrc/mmdeploy/backend_ops/onnxruntime/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/onnxruntime/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/onnxruntime/CMakeLists.txt diff --git a/csrc/backend_ops/onnxruntime/common/onnxruntime_register.h b/csrc/mmdeploy/backend_ops/onnxruntime/common/onnxruntime_register.h similarity index 92% rename from csrc/backend_ops/onnxruntime/common/onnxruntime_register.h rename to csrc/mmdeploy/backend_ops/onnxruntime/common/onnxruntime_register.h index 344031e791..28d2a2b782 100644 --- a/csrc/backend_ops/onnxruntime/common/onnxruntime_register.h +++ b/csrc/mmdeploy/backend_ops/onnxruntime/common/onnxruntime_register.h @@ -3,7 +3,7 @@ #define ONNXRUNTIME_REGISTER_H #include -#include "core/macro.h" +#include "mmdeploy/core/macro.h" #ifdef __cplusplus extern "C" { diff --git a/csrc/backend_ops/onnxruntime/common/onnxruntime_session_options_config_keys.h b/csrc/mmdeploy/backend_ops/onnxruntime/common/onnxruntime_session_options_config_keys.h similarity index 100% rename from csrc/backend_ops/onnxruntime/common/onnxruntime_session_options_config_keys.h rename to csrc/mmdeploy/backend_ops/onnxruntime/common/onnxruntime_session_options_config_keys.h diff --git a/csrc/backend_ops/onnxruntime/common/ort_utils.cpp b/csrc/mmdeploy/backend_ops/onnxruntime/common/ort_utils.cpp similarity index 100% rename from csrc/backend_ops/onnxruntime/common/ort_utils.cpp rename to csrc/mmdeploy/backend_ops/onnxruntime/common/ort_utils.cpp diff --git a/csrc/backend_ops/onnxruntime/common/ort_utils.h b/csrc/mmdeploy/backend_ops/onnxruntime/common/ort_utils.h similarity index 100% rename from csrc/backend_ops/onnxruntime/common/ort_utils.h rename to csrc/mmdeploy/backend_ops/onnxruntime/common/ort_utils.h diff --git a/csrc/backend_ops/onnxruntime/grid_sample/grid_sample.cpp b/csrc/mmdeploy/backend_ops/onnxruntime/grid_sample/grid_sample.cpp similarity index 100% rename from csrc/backend_ops/onnxruntime/grid_sample/grid_sample.cpp rename to csrc/mmdeploy/backend_ops/onnxruntime/grid_sample/grid_sample.cpp diff --git a/csrc/backend_ops/onnxruntime/grid_sample/grid_sample.h b/csrc/mmdeploy/backend_ops/onnxruntime/grid_sample/grid_sample.h similarity index 100% rename from csrc/backend_ops/onnxruntime/grid_sample/grid_sample.h rename to csrc/mmdeploy/backend_ops/onnxruntime/grid_sample/grid_sample.h diff --git a/csrc/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.cpp b/csrc/mmdeploy/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.cpp similarity index 100% rename from csrc/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.cpp rename to csrc/mmdeploy/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.cpp diff --git a/csrc/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.h b/csrc/mmdeploy/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.h similarity index 100% rename from csrc/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.h rename to csrc/mmdeploy/backend_ops/onnxruntime/modulated_deform_conv/modulated_deform_conv.h diff --git a/csrc/backend_ops/onnxruntime/nms_rotated/nms_rotated.cpp b/csrc/mmdeploy/backend_ops/onnxruntime/nms_rotated/nms_rotated.cpp similarity index 100% rename from csrc/backend_ops/onnxruntime/nms_rotated/nms_rotated.cpp rename to csrc/mmdeploy/backend_ops/onnxruntime/nms_rotated/nms_rotated.cpp diff --git a/csrc/backend_ops/onnxruntime/nms_rotated/nms_rotated.h b/csrc/mmdeploy/backend_ops/onnxruntime/nms_rotated/nms_rotated.h similarity index 100% rename from csrc/backend_ops/onnxruntime/nms_rotated/nms_rotated.h rename to csrc/mmdeploy/backend_ops/onnxruntime/nms_rotated/nms_rotated.h diff --git a/csrc/backend_ops/onnxruntime/onnxruntime_register.cpp b/csrc/mmdeploy/backend_ops/onnxruntime/onnxruntime_register.cpp similarity index 100% rename from csrc/backend_ops/onnxruntime/onnxruntime_register.cpp rename to csrc/mmdeploy/backend_ops/onnxruntime/onnxruntime_register.cpp diff --git a/csrc/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.cpp b/csrc/mmdeploy/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.cpp similarity index 100% rename from csrc/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.cpp rename to csrc/mmdeploy/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.cpp diff --git a/csrc/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.h b/csrc/mmdeploy/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.h similarity index 100% rename from csrc/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.h rename to csrc/mmdeploy/backend_ops/onnxruntime/roi_align_rotated/roi_align_rotated.h diff --git a/csrc/backend_ops/tensorrt/CMakeLists.txt b/csrc/mmdeploy/backend_ops/tensorrt/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/tensorrt/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/tensorrt/CMakeLists.txt diff --git a/csrc/backend_ops/tensorrt/batched_nms/trt_batched_nms.cpp b/csrc/mmdeploy/backend_ops/tensorrt/batched_nms/trt_batched_nms.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/batched_nms/trt_batched_nms.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/batched_nms/trt_batched_nms.cpp diff --git a/csrc/backend_ops/tensorrt/batched_nms/trt_batched_nms.hpp b/csrc/mmdeploy/backend_ops/tensorrt/batched_nms/trt_batched_nms.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/batched_nms/trt_batched_nms.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/batched_nms/trt_batched_nms.hpp diff --git a/csrc/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.cpp b/csrc/mmdeploy/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.cpp diff --git a/csrc/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.hpp b/csrc/mmdeploy/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/batched_rotated_nms/trt_batched_rotated_nms.hpp diff --git a/csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.cpp b/csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.cpp diff --git a/csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.hpp b/csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate.hpp diff --git a/csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.cu diff --git a/csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/bicubic_interpolate/trt_bicubic_interpolate_kernel.hpp diff --git a/csrc/backend_ops/tensorrt/common/common_cuda_helper.hpp b/csrc/mmdeploy/backend_ops/tensorrt/common/common_cuda_helper.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/common/common_cuda_helper.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/common/common_cuda_helper.hpp diff --git a/csrc/backend_ops/tensorrt/common/nms/batched_nms_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/common/nms/batched_nms_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/common/nms/batched_nms_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/common/nms/batched_nms_kernel.hpp diff --git a/csrc/backend_ops/tensorrt/common/nms/cub_helper.h b/csrc/mmdeploy/backend_ops/tensorrt/common/nms/cub_helper.h similarity index 100% rename from csrc/backend_ops/tensorrt/common/nms/cub_helper.h rename to csrc/mmdeploy/backend_ops/tensorrt/common/nms/cub_helper.h diff --git a/csrc/backend_ops/tensorrt/common/nms/kernel.h b/csrc/mmdeploy/backend_ops/tensorrt/common/nms/kernel.h similarity index 100% rename from csrc/backend_ops/tensorrt/common/nms/kernel.h rename to csrc/mmdeploy/backend_ops/tensorrt/common/nms/kernel.h diff --git a/csrc/backend_ops/tensorrt/common/trt_plugin_base.hpp b/csrc/mmdeploy/backend_ops/tensorrt/common/trt_plugin_base.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/common/trt_plugin_base.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/common/trt_plugin_base.hpp diff --git a/csrc/backend_ops/tensorrt/common/trt_plugin_helper.hpp b/csrc/mmdeploy/backend_ops/tensorrt/common/trt_plugin_helper.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/common/trt_plugin_helper.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/common/trt_plugin_helper.hpp diff --git a/csrc/backend_ops/tensorrt/common/trt_serialize.hpp b/csrc/mmdeploy/backend_ops/tensorrt/common/trt_serialize.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/common/trt_serialize.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/common/trt_serialize.hpp diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/allClassNMS.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/allClassNMS.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/allClassNMS.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/allClassNMS.cu diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/allClassRotatedNMS.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/allClassRotatedNMS.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/allClassRotatedNMS.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/allClassRotatedNMS.cu diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/batched_nms_kernel.cpp b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/batched_nms_kernel.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/batched_nms_kernel.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/batched_nms_kernel.cpp diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/gatherNMSOutputs.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/gatherNMSOutputs.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/gatherNMSOutputs.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/gatherNMSOutputs.cu diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/kernel.cu diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/permuteData.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/permuteData.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/permuteData.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/permuteData.cu diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/sortScoresPerClass.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/sortScoresPerClass.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/sortScoresPerClass.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/sortScoresPerClass.cu diff --git a/csrc/backend_ops/tensorrt/common_impl/nms/sortScoresPerImage.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/sortScoresPerImage.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/nms/sortScoresPerImage.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/nms/sortScoresPerImage.cu diff --git a/csrc/backend_ops/tensorrt/common_impl/trt_cuda_helper.cu b/csrc/mmdeploy/backend_ops/tensorrt/common_impl/trt_cuda_helper.cu similarity index 100% rename from csrc/backend_ops/tensorrt/common_impl/trt_cuda_helper.cu rename to csrc/mmdeploy/backend_ops/tensorrt/common_impl/trt_cuda_helper.cu diff --git a/csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv.cpp b/csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv.cpp diff --git a/csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv.hpp b/csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv.hpp diff --git a/csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cu diff --git a/csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cuh b/csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cuh similarity index 100% rename from csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cuh rename to csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.cuh diff --git a/csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/deform_conv/trt_deform_conv_kernel.hpp diff --git a/csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.cpp b/csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.cpp diff --git a/csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.hpp b/csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler.hpp diff --git a/csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.cu diff --git a/csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/grid_sampler/trt_grid_sampler_kernel.hpp diff --git a/csrc/backend_ops/tensorrt/instance_norm/trt_instance_norm.cpp b/csrc/mmdeploy/backend_ops/tensorrt/instance_norm/trt_instance_norm.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/instance_norm/trt_instance_norm.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/instance_norm/trt_instance_norm.cpp diff --git a/csrc/backend_ops/tensorrt/instance_norm/trt_instance_norm.hpp b/csrc/mmdeploy/backend_ops/tensorrt/instance_norm/trt_instance_norm.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/instance_norm/trt_instance_norm.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/instance_norm/trt_instance_norm.hpp diff --git a/csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.cpp b/csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.cpp diff --git a/csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.hpp b/csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv.hpp diff --git a/csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.cu diff --git a/csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/modulated_deform_conv/trt_modulated_deform_conv_kernel.hpp diff --git a/csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.cpp b/csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.cpp diff --git a/csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.hpp b/csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align.hpp diff --git a/csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.cu diff --git a/csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/multi_level_roi_align/trt_multi_level_roi_align_kernel.hpp diff --git a/csrc/backend_ops/tensorrt/roi_align/trt_roi_align.cpp b/csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/roi_align/trt_roi_align.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align.cpp diff --git a/csrc/backend_ops/tensorrt/roi_align/trt_roi_align.hpp b/csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/roi_align/trt_roi_align.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align.hpp diff --git a/csrc/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.cu diff --git a/csrc/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/roi_align/trt_roi_align_kernel.hpp diff --git a/csrc/backend_ops/tensorrt/scatternd/trt_scatternd.cpp b/csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd.cpp similarity index 100% rename from csrc/backend_ops/tensorrt/scatternd/trt_scatternd.cpp rename to csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd.cpp diff --git a/csrc/backend_ops/tensorrt/scatternd/trt_scatternd.hpp b/csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/scatternd/trt_scatternd.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd.hpp diff --git a/csrc/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.cu b/csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.cu similarity index 100% rename from csrc/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.cu rename to csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.cu diff --git a/csrc/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.hpp b/csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.hpp similarity index 100% rename from csrc/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.hpp rename to csrc/mmdeploy/backend_ops/tensorrt/scatternd/trt_scatternd_kernel.hpp diff --git a/csrc/backend_ops/torchscript/CMakeLists.txt b/csrc/mmdeploy/backend_ops/torchscript/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/torchscript/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/torchscript/CMakeLists.txt diff --git a/csrc/backend_ops/torchscript/bind.cpp b/csrc/mmdeploy/backend_ops/torchscript/bind.cpp similarity index 100% rename from csrc/backend_ops/torchscript/bind.cpp rename to csrc/mmdeploy/backend_ops/torchscript/bind.cpp diff --git a/csrc/backend_ops/torchscript/ops/CMakeLists.txt b/csrc/mmdeploy/backend_ops/torchscript/ops/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/torchscript/ops/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/torchscript/ops/CMakeLists.txt diff --git a/csrc/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cpu.cpp b/csrc/mmdeploy/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cpu.cpp similarity index 100% rename from csrc/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cpu.cpp rename to csrc/mmdeploy/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cpu.cpp diff --git a/csrc/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cuda.cu b/csrc/mmdeploy/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cuda.cu similarity index 100% rename from csrc/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cuda.cu rename to csrc/mmdeploy/backend_ops/torchscript/ops/modulated_deform_conv/modulated_deform_conv_cuda.cu diff --git a/csrc/backend_ops/torchscript/optimizer/CMakeLists.txt b/csrc/mmdeploy/backend_ops/torchscript/optimizer/CMakeLists.txt similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/CMakeLists.txt rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/CMakeLists.txt diff --git a/csrc/backend_ops/torchscript/optimizer/bind.cpp b/csrc/mmdeploy/backend_ops/torchscript/optimizer/bind.cpp similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/bind.cpp rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/bind.cpp diff --git a/csrc/backend_ops/torchscript/optimizer/ir/subgraph_matcher.cpp b/csrc/mmdeploy/backend_ops/torchscript/optimizer/ir/subgraph_matcher.cpp similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/ir/subgraph_matcher.cpp rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/ir/subgraph_matcher.cpp diff --git a/csrc/backend_ops/torchscript/optimizer/ir/subgraph_matcher.h b/csrc/mmdeploy/backend_ops/torchscript/optimizer/ir/subgraph_matcher.h similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/ir/subgraph_matcher.h rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/ir/subgraph_matcher.h diff --git a/csrc/backend_ops/torchscript/optimizer/optimizer.cpp b/csrc/mmdeploy/backend_ops/torchscript/optimizer/optimizer.cpp similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/optimizer.cpp rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/optimizer.cpp diff --git a/csrc/backend_ops/torchscript/optimizer/optimizer.h b/csrc/mmdeploy/backend_ops/torchscript/optimizer/optimizer.h similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/optimizer.h rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/optimizer.h diff --git a/csrc/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.cpp b/csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.cpp similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.cpp rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.cpp diff --git a/csrc/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.h b/csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.h similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.h rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.h diff --git a/csrc/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.cpp b/csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.cpp similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.cpp rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.cpp diff --git a/csrc/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.h b/csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.h similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.h rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.h diff --git a/csrc/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.cpp b/csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.cpp similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.cpp rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.cpp diff --git a/csrc/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.h b/csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.h similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.h rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/onnx_peephole.h diff --git a/csrc/backend_ops/torchscript/optimizer/passes/onnx/utils.h b/csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/utils.h similarity index 100% rename from csrc/backend_ops/torchscript/optimizer/passes/onnx/utils.h rename to csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/utils.h diff --git a/csrc/codebase/CMakeLists.txt b/csrc/mmdeploy/codebase/CMakeLists.txt similarity index 100% rename from csrc/codebase/CMakeLists.txt rename to csrc/mmdeploy/codebase/CMakeLists.txt diff --git a/csrc/codebase/common.h b/csrc/mmdeploy/codebase/common.h similarity index 93% rename from csrc/codebase/common.h rename to csrc/mmdeploy/codebase/common.h index c815aa11f7..3a965a1783 100644 --- a/csrc/codebase/common.h +++ b/csrc/mmdeploy/codebase/common.h @@ -3,11 +3,11 @@ #ifndef MMDEPLOY_SRC_CODEBASE_COMMON_H_ #define MMDEPLOY_SRC_CODEBASE_COMMON_H_ -#include "core/device.h" -#include "core/module.h" -#include "core/registry.h" -#include "core/utils/formatter.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/experimental/module_adapter.h" namespace mmdeploy { diff --git a/csrc/codebase/mmcls/CMakeLists.txt b/csrc/mmdeploy/codebase/mmcls/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmcls/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmcls/CMakeLists.txt diff --git a/csrc/codebase/mmcls/linear_cls.cpp b/csrc/mmdeploy/codebase/mmcls/linear_cls.cpp similarity index 90% rename from csrc/codebase/mmcls/linear_cls.cpp rename to csrc/mmdeploy/codebase/mmcls/linear_cls.cpp index 8b14f4e926..705ba5a9dc 100644 --- a/csrc/codebase/mmcls/linear_cls.cpp +++ b/csrc/mmdeploy/codebase/mmcls/linear_cls.cpp @@ -3,11 +3,11 @@ #include #include -#include "codebase/mmcls/mmcls.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/codebase/mmcls/mmcls.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/experimental/module_adapter.h" using std::vector; diff --git a/csrc/codebase/mmcls/mmcls.cpp b/csrc/mmdeploy/codebase/mmcls/mmcls.cpp similarity index 82% rename from csrc/codebase/mmcls/mmcls.cpp rename to csrc/mmdeploy/codebase/mmcls/mmcls.cpp index 973a4c6d80..69c7762426 100644 --- a/csrc/codebase/mmcls/mmcls.cpp +++ b/csrc/mmdeploy/codebase/mmcls/mmcls.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmcls/mmcls.h" +#include "mmdeploy/codebase/mmcls/mmcls.h" namespace mmdeploy { namespace mmcls { diff --git a/csrc/codebase/mmcls/mmcls.h b/csrc/mmdeploy/codebase/mmcls/mmcls.h similarity index 79% rename from csrc/codebase/mmcls/mmcls.h rename to csrc/mmdeploy/codebase/mmcls/mmcls.h index 2b87b2d538..698e832e82 100644 --- a/csrc/codebase/mmcls/mmcls.h +++ b/csrc/mmdeploy/codebase/mmcls/mmcls.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_SRC_CODEBASE_MMCLS_MMCLS_H_ #define MMDEPLOY_SRC_CODEBASE_MMCLS_MMCLS_H_ -#include "codebase/common.h" -#include "core/device.h" -#include "core/module.h" -#include "core/serialization.h" +#include "mmdeploy/codebase/common.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/serialization.h" namespace mmdeploy { namespace mmcls { diff --git a/csrc/codebase/mmdet/CMakeLists.txt b/csrc/mmdeploy/codebase/mmdet/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmdet/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmdet/CMakeLists.txt diff --git a/csrc/codebase/mmdet/instance_segmentation.cpp b/csrc/mmdeploy/codebase/mmdet/instance_segmentation.cpp similarity index 97% rename from csrc/codebase/mmdet/instance_segmentation.cpp rename to csrc/mmdeploy/codebase/mmdet/instance_segmentation.cpp index 638ce0b80a..02fa959908 100644 --- a/csrc/codebase/mmdet/instance_segmentation.cpp +++ b/csrc/mmdeploy/codebase/mmdet/instance_segmentation.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/registry.h" -#include "core/utils/device_utils.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/experimental/module_adapter.h" #include "object_detection.h" #include "opencv2/imgproc/imgproc.hpp" #include "opencv_utils.h" diff --git a/csrc/codebase/mmdet/mmdet.cpp b/csrc/mmdeploy/codebase/mmdet/mmdet.cpp similarity index 82% rename from csrc/codebase/mmdet/mmdet.cpp rename to csrc/mmdeploy/codebase/mmdet/mmdet.cpp index 45fe21f9b0..abfe16b19e 100644 --- a/csrc/codebase/mmdet/mmdet.cpp +++ b/csrc/mmdeploy/codebase/mmdet/mmdet.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmdet/mmdet.h" +#include "mmdeploy/codebase/mmdet/mmdet.h" namespace mmdeploy { namespace mmdet { diff --git a/csrc/codebase/mmdet/mmdet.h b/csrc/mmdeploy/codebase/mmdet/mmdet.h similarity index 76% rename from csrc/codebase/mmdet/mmdet.h rename to csrc/mmdeploy/codebase/mmdet/mmdet.h index dcb1e18194..cf83d6797b 100644 --- a/csrc/codebase/mmdet/mmdet.h +++ b/csrc/mmdeploy/codebase/mmdet/mmdet.h @@ -5,12 +5,12 @@ #include -#include "codebase/common.h" -#include "core/device.h" -#include "core/mat.h" -#include "core/module.h" -#include "core/registry.h" -#include "core/serialization.h" +#include "mmdeploy/codebase/common.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/serialization.h" namespace mmdeploy { namespace mmdet { diff --git a/csrc/codebase/mmdet/object_detection.cpp b/csrc/mmdeploy/codebase/mmdet/object_detection.cpp similarity index 98% rename from csrc/codebase/mmdet/object_detection.cpp rename to csrc/mmdeploy/codebase/mmdet/object_detection.cpp index 42de3ca205..486faff43c 100644 --- a/csrc/codebase/mmdet/object_detection.cpp +++ b/csrc/mmdeploy/codebase/mmdet/object_detection.cpp @@ -2,9 +2,9 @@ #include "object_detection.h" -#include "core/registry.h" -#include "core/utils/device_utils.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/experimental/module_adapter.h" using namespace std; diff --git a/csrc/codebase/mmdet/object_detection.h b/csrc/mmdeploy/codebase/mmdet/object_detection.h similarity index 90% rename from csrc/codebase/mmdet/object_detection.h rename to csrc/mmdeploy/codebase/mmdet/object_detection.h index d1a250c5f0..ea4faa6781 100644 --- a/csrc/codebase/mmdet/object_detection.h +++ b/csrc/mmdeploy/codebase/mmdet/object_detection.h @@ -3,9 +3,9 @@ #ifndef MMDEPLOY_SRC_CODEBASE_MMDET_OBJECT_DETECTION_H_ #define MMDEPLOY_SRC_CODEBASE_MMDET_OBJECT_DETECTION_H_ -#include "codebase/mmdet/mmdet.h" -#include "core/tensor.h" -#include "core/utils/formatter.h" +#include "mmdeploy/codebase/mmdet/mmdet.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/formatter.h" namespace mmdeploy::mmdet { diff --git a/csrc/codebase/mmedit/CMakeLists.txt b/csrc/mmdeploy/codebase/mmedit/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmedit/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmedit/CMakeLists.txt diff --git a/csrc/codebase/mmedit/mmedit.cpp b/csrc/mmdeploy/codebase/mmedit/mmedit.cpp similarity index 72% rename from csrc/codebase/mmedit/mmedit.cpp rename to csrc/mmdeploy/codebase/mmedit/mmedit.cpp index b10c084b24..5c6d4d407a 100644 --- a/csrc/codebase/mmedit/mmedit.cpp +++ b/csrc/mmdeploy/codebase/mmedit/mmedit.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmedit/mmedit.h" +#include "mmdeploy/codebase/mmedit/mmedit.h" -#include "core/registry.h" +#include "mmdeploy/core/registry.h" namespace mmdeploy { namespace mmedit { diff --git a/csrc/codebase/mmedit/mmedit.h b/csrc/mmdeploy/codebase/mmedit/mmedit.h similarity index 68% rename from csrc/codebase/mmedit/mmedit.h rename to csrc/mmdeploy/codebase/mmedit/mmedit.h index e7c4285134..122a383c22 100644 --- a/csrc/codebase/mmedit/mmedit.h +++ b/csrc/mmdeploy/codebase/mmedit/mmedit.h @@ -3,11 +3,11 @@ #ifndef MMDEPLOY_SRC_CODEBASE_MMEDIT_MMEDIT_H_ #define MMDEPLOY_SRC_CODEBASE_MMEDIT_MMEDIT_H_ -#include "codebase/common.h" -#include "core/device.h" -#include "core/mat.h" -#include "core/module.h" -#include "core/serialization.h" +#include "mmdeploy/codebase/common.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/serialization.h" namespace mmdeploy { namespace mmedit { diff --git a/csrc/codebase/mmedit/restorer.cpp b/csrc/mmdeploy/codebase/mmedit/restorer.cpp similarity index 93% rename from csrc/codebase/mmedit/restorer.cpp rename to csrc/mmdeploy/codebase/mmedit/restorer.cpp index 84626d15be..e748ed7740 100644 --- a/csrc/codebase/mmedit/restorer.cpp +++ b/csrc/mmdeploy/codebase/mmedit/restorer.cpp @@ -2,9 +2,9 @@ #include -#include "codebase/mmedit/mmedit.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/codebase/mmedit/mmedit.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" namespace mmdeploy::mmedit { diff --git a/csrc/codebase/mmocr/CMakeLists.txt b/csrc/mmdeploy/codebase/mmocr/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmocr/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmocr/CMakeLists.txt diff --git a/csrc/codebase/mmocr/contour_expand.cpp b/csrc/mmdeploy/codebase/mmocr/contour_expand.cpp similarity index 99% rename from csrc/codebase/mmocr/contour_expand.cpp rename to csrc/mmdeploy/codebase/mmocr/contour_expand.cpp index 8024df6ed9..4c9fe1e02a 100644 --- a/csrc/codebase/mmocr/contour_expand.cpp +++ b/csrc/mmdeploy/codebase/mmocr/contour_expand.cpp @@ -8,7 +8,7 @@ #include #include -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "opencv2/opencv.hpp" namespace mmdeploy::mmocr { diff --git a/csrc/codebase/mmocr/cpu/CMakeLists.txt b/csrc/mmdeploy/codebase/mmocr/cpu/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmocr/cpu/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmocr/cpu/CMakeLists.txt diff --git a/csrc/codebase/mmocr/cpu/dbnet.cpp b/csrc/mmdeploy/codebase/mmocr/cpu/dbnet.cpp similarity index 96% rename from csrc/codebase/mmocr/cpu/dbnet.cpp rename to csrc/mmdeploy/codebase/mmocr/cpu/dbnet.cpp index 697fd9fd68..8eaec861ab 100644 --- a/csrc/codebase/mmocr/cpu/dbnet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/cpu/dbnet.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/dbnet.h" +#include "mmdeploy/codebase/mmocr/dbnet.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/utils/device_utils.h" #include "opencv2/imgcodecs.hpp" #include "opencv2/imgproc.hpp" diff --git a/csrc/codebase/mmocr/cpu/panet.cpp b/csrc/mmdeploy/codebase/mmocr/cpu/panet.cpp similarity index 97% rename from csrc/codebase/mmocr/cpu/panet.cpp rename to csrc/mmdeploy/codebase/mmocr/cpu/panet.cpp index 6cd444464e..8a8cf09537 100644 --- a/csrc/codebase/mmocr/cpu/panet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/cpu/panet.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/panet.h" +#include "mmdeploy/codebase/mmocr/panet.h" #include "opencv2/imgproc.hpp" diff --git a/csrc/codebase/mmocr/cpu/psenet.cpp b/csrc/mmdeploy/codebase/mmocr/cpu/psenet.cpp similarity index 95% rename from csrc/codebase/mmocr/cpu/psenet.cpp rename to csrc/mmdeploy/codebase/mmocr/cpu/psenet.cpp index abfa213020..fa3bbcd70e 100644 --- a/csrc/codebase/mmocr/cpu/psenet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/cpu/psenet.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/psenet.h" +#include "mmdeploy/codebase/mmocr/psenet.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/utils/device_utils.h" #include "opencv2/imgproc.hpp" namespace mmdeploy::mmocr { diff --git a/csrc/codebase/mmocr/crnn.cpp b/csrc/mmdeploy/codebase/mmocr/crnn.cpp similarity index 94% rename from csrc/codebase/mmocr/crnn.cpp rename to csrc/mmdeploy/codebase/mmocr/crnn.cpp index fc611e8588..482bd7fb7e 100644 --- a/csrc/codebase/mmocr/crnn.cpp +++ b/csrc/mmdeploy/codebase/mmocr/crnn.cpp @@ -3,14 +3,14 @@ #include #include -#include "core/device.h" -#include "core/model.h" -#include "core/registry.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" -#include "core/value.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/experimental/module_adapter.h" #include "mmocr.h" namespace mmdeploy::mmocr { diff --git a/csrc/codebase/mmocr/cuda/CMakeLists.txt b/csrc/mmdeploy/codebase/mmocr/cuda/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmocr/cuda/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmocr/cuda/CMakeLists.txt diff --git a/csrc/codebase/mmocr/cuda/connected_component.cu b/csrc/mmdeploy/codebase/mmocr/cuda/connected_component.cu similarity index 100% rename from csrc/codebase/mmocr/cuda/connected_component.cu rename to csrc/mmdeploy/codebase/mmocr/cuda/connected_component.cu diff --git a/csrc/codebase/mmocr/cuda/connected_component.h b/csrc/mmdeploy/codebase/mmocr/cuda/connected_component.h similarity index 100% rename from csrc/codebase/mmocr/cuda/connected_component.h rename to csrc/mmdeploy/codebase/mmocr/cuda/connected_component.h diff --git a/csrc/codebase/mmocr/cuda/dbnet.cpp b/csrc/mmdeploy/codebase/mmocr/cuda/dbnet.cpp similarity index 90% rename from csrc/codebase/mmocr/cuda/dbnet.cpp rename to csrc/mmdeploy/codebase/mmocr/cuda/dbnet.cpp index 36bb434c9c..a96c5de530 100644 --- a/csrc/codebase/mmocr/cuda/dbnet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/cuda/dbnet.cpp @@ -1,12 +1,11 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/dbnet.h" +#include "mmdeploy/codebase/mmocr/dbnet.h" -#include "codebase/mmocr/cuda/connected_component.h" -#include "codebase/mmocr/cuda/utils.h" -#include "core/utils/device_utils.h" -#include "cuda_runtime.h" -#include "device/cuda/cuda_device.h" +#include "mmdeploy/codebase/mmocr/cuda/connected_component.h" +#include "mmdeploy/codebase/mmocr/cuda/utils.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/device/cuda/cuda_device.h" #include "opencv2/imgcodecs.hpp" #include "opencv2/imgproc.hpp" diff --git a/csrc/codebase/mmocr/cuda/panet.cpp b/csrc/mmdeploy/codebase/mmocr/cuda/panet.cpp similarity index 94% rename from csrc/codebase/mmocr/cuda/panet.cpp rename to csrc/mmdeploy/codebase/mmocr/cuda/panet.cpp index 4c555e39a8..100808bcf4 100644 --- a/csrc/codebase/mmocr/cuda/panet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/cuda/panet.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/panet.h" +#include "mmdeploy/codebase/mmocr/panet.h" -#include "codebase/mmocr/cuda/connected_component.h" -#include "codebase/mmocr/cuda/utils.h" -#include "device/cuda/cuda_device.h" +#include "mmdeploy/codebase/mmocr/cuda/connected_component.h" +#include "mmdeploy/codebase/mmocr/cuda/utils.h" +#include "mmdeploy/device/cuda/cuda_device.h" namespace mmdeploy::mmocr { diff --git a/csrc/codebase/mmocr/cuda/psenet.cpp b/csrc/mmdeploy/codebase/mmocr/cuda/psenet.cpp similarity index 90% rename from csrc/codebase/mmocr/cuda/psenet.cpp rename to csrc/mmdeploy/codebase/mmocr/cuda/psenet.cpp index 26edd9e172..33a94d2f8b 100644 --- a/csrc/codebase/mmocr/cuda/psenet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/cuda/psenet.cpp @@ -1,11 +1,11 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/psenet.h" +#include "mmdeploy/codebase/mmocr/psenet.h" -#include "codebase/mmocr/cuda/connected_component.h" -#include "codebase/mmocr/cuda/utils.h" -#include "core/utils/device_utils.h" -#include "device/cuda/cuda_device.h" +#include "mmdeploy/codebase/mmocr/cuda/connected_component.h" +#include "mmdeploy/codebase/mmocr/cuda/utils.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/device/cuda/cuda_device.h" #include "opencv2/imgproc.hpp" namespace mmdeploy::mmocr { diff --git a/csrc/codebase/mmocr/cuda/utils.cu b/csrc/mmdeploy/codebase/mmocr/cuda/utils.cu similarity index 98% rename from csrc/codebase/mmocr/cuda/utils.cu rename to csrc/mmdeploy/codebase/mmocr/cuda/utils.cu index 13dc294499..2f0cf27419 100644 --- a/csrc/codebase/mmocr/cuda/utils.cu +++ b/csrc/mmdeploy/codebase/mmocr/cuda/utils.cu @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/cuda/utils.h" +#include "mmdeploy/codebase/mmocr/cuda/utils.h" #include "thrust/iterator/counting_iterator.h" #include "thrust/transform.h" diff --git a/csrc/codebase/mmocr/cuda/utils.h b/csrc/mmdeploy/codebase/mmocr/cuda/utils.h similarity index 100% rename from csrc/codebase/mmocr/cuda/utils.h rename to csrc/mmdeploy/codebase/mmocr/cuda/utils.h diff --git a/csrc/codebase/mmocr/dbnet.cpp b/csrc/mmdeploy/codebase/mmocr/dbnet.cpp similarity index 95% rename from csrc/codebase/mmocr/dbnet.cpp rename to csrc/mmdeploy/codebase/mmocr/dbnet.cpp index c41ad54ea0..c4a84006db 100644 --- a/csrc/codebase/mmocr/dbnet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/dbnet.cpp @@ -1,14 +1,14 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/dbnet.h" +#include "mmdeploy/codebase/mmocr/dbnet.h" #include #include "clipper.hpp" -#include "core/device.h" -#include "core/tensor.h" -#include "core/utils/formatter.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/experimental/module_adapter.h" #include "mmocr.h" namespace mmdeploy { diff --git a/csrc/codebase/mmocr/dbnet.h b/csrc/mmdeploy/codebase/mmocr/dbnet.h similarity index 83% rename from csrc/codebase/mmocr/dbnet.h rename to csrc/mmdeploy/codebase/mmocr/dbnet.h index d74455109c..e1a437354c 100644 --- a/csrc/codebase/mmocr/dbnet.h +++ b/csrc/mmdeploy/codebase/mmocr/dbnet.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_CSRC_CODEBASE_MMOCR_DBNET_H_ #define MMDEPLOY_CSRC_CODEBASE_MMOCR_DBNET_H_ -#include "codebase/mmocr/mmocr.h" -#include "core/device.h" -#include "core/registry.h" -#include "core/tensor.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" #include "opencv2/core.hpp" namespace mmdeploy { diff --git a/csrc/codebase/mmocr/mmocr.cpp b/csrc/mmdeploy/codebase/mmocr/mmocr.cpp similarity index 62% rename from csrc/codebase/mmocr/mmocr.cpp rename to csrc/mmdeploy/codebase/mmocr/mmocr.cpp index f34f918afa..2aeef1fda9 100644 --- a/csrc/codebase/mmocr/mmocr.cpp +++ b/csrc/mmdeploy/codebase/mmocr/mmocr.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/mmocr.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" -#include "core/registry.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/formatter.h" namespace mmdeploy { namespace mmocr { diff --git a/csrc/codebase/mmocr/mmocr.h b/csrc/mmdeploy/codebase/mmocr/mmocr.h similarity index 84% rename from csrc/codebase/mmocr/mmocr.h rename to csrc/mmdeploy/codebase/mmocr/mmocr.h index 493fa71b35..d94ed3c6d4 100644 --- a/csrc/codebase/mmocr/mmocr.h +++ b/csrc/mmdeploy/codebase/mmocr/mmocr.h @@ -5,9 +5,9 @@ #include -#include "codebase/common.h" -#include "core/device.h" -#include "core/module.h" +#include "mmdeploy/codebase/common.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/module.h" namespace mmdeploy { namespace mmocr { diff --git a/csrc/codebase/mmocr/panet.cpp b/csrc/mmdeploy/codebase/mmocr/panet.cpp similarity index 94% rename from csrc/codebase/mmocr/panet.cpp rename to csrc/mmdeploy/codebase/mmocr/panet.cpp index 11a50d876f..9c5ecb2812 100644 --- a/csrc/codebase/mmocr/panet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/panet.cpp @@ -1,15 +1,15 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/panet.h" +#include "mmdeploy/codebase/mmocr/panet.h" #include #include -#include "codebase/mmocr/mmocr.h" -#include "core/device.h" -#include "core/registry.h" -#include "core/serialization.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/serialization.h" +#include "mmdeploy/core/utils/device_utils.h" namespace mmdeploy { diff --git a/csrc/codebase/mmocr/panet.h b/csrc/mmdeploy/codebase/mmocr/panet.h similarity index 89% rename from csrc/codebase/mmocr/panet.h rename to csrc/mmdeploy/codebase/mmocr/panet.h index 863759663b..07ee4e81f1 100644 --- a/csrc/codebase/mmocr/panet.h +++ b/csrc/mmdeploy/codebase/mmocr/panet.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_CSRC_CODEBASE_MMOCR_PANET_H_ #define MMDEPLOY_CSRC_CODEBASE_MMOCR_PANET_H_ -#include "codebase/mmocr/mmocr.h" -#include "core/device.h" -#include "core/registry.h" -#include "core/tensor.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" #include "opencv2/core.hpp" namespace mmdeploy { diff --git a/csrc/codebase/mmocr/pixel_group.cpp b/csrc/mmdeploy/codebase/mmocr/pixel_group.cpp similarity index 99% rename from csrc/codebase/mmocr/pixel_group.cpp rename to csrc/mmdeploy/codebase/mmocr/pixel_group.cpp index 4199caa30f..36239de210 100644 --- a/csrc/codebase/mmocr/pixel_group.cpp +++ b/csrc/mmdeploy/codebase/mmocr/pixel_group.cpp @@ -7,7 +7,7 @@ #include #include -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "opencv2/opencv.hpp" namespace mmdeploy::mmocr { diff --git a/csrc/codebase/mmocr/psenet.cpp b/csrc/mmdeploy/codebase/mmocr/psenet.cpp similarity index 94% rename from csrc/codebase/mmocr/psenet.cpp rename to csrc/mmdeploy/codebase/mmocr/psenet.cpp index c4b5f33b24..3b0f2bd5fb 100644 --- a/csrc/codebase/mmocr/psenet.cpp +++ b/csrc/mmdeploy/codebase/mmocr/psenet.cpp @@ -1,15 +1,15 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmocr/psenet.h" +#include "mmdeploy/codebase/mmocr/psenet.h" #include #include -#include "codebase/mmocr/mmocr.h" -#include "core/device.h" -#include "core/registry.h" -#include "core/serialization.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/serialization.h" +#include "mmdeploy/core/utils/device_utils.h" namespace mmdeploy { namespace mmocr { diff --git a/csrc/codebase/mmocr/psenet.h b/csrc/mmdeploy/codebase/mmocr/psenet.h similarity index 85% rename from csrc/codebase/mmocr/psenet.h rename to csrc/mmdeploy/codebase/mmocr/psenet.h index 96521e32df..4fafc26a53 100644 --- a/csrc/codebase/mmocr/psenet.h +++ b/csrc/mmdeploy/codebase/mmocr/psenet.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_CSRC_CODEBASE_MMOCR_PSENET_H_ #define MMDEPLOY_CSRC_CODEBASE_MMOCR_PSENET_H_ -#include "codebase/mmocr/mmocr.h" -#include "core/device.h" -#include "core/registry.h" -#include "core/tensor.h" +#include "mmdeploy/codebase/mmocr/mmocr.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" #include "opencv2/core.hpp" namespace mmdeploy { diff --git a/csrc/codebase/mmocr/resize_ocr.cpp b/csrc/mmdeploy/codebase/mmocr/resize_ocr.cpp similarity index 93% rename from csrc/codebase/mmocr/resize_ocr.cpp rename to csrc/mmdeploy/codebase/mmocr/resize_ocr.cpp index 69d7602d18..85420e7ed9 100644 --- a/csrc/codebase/mmocr/resize_ocr.cpp +++ b/csrc/mmdeploy/codebase/mmocr/resize_ocr.cpp @@ -2,16 +2,16 @@ #include -#include "archive/json_archive.h" -#include "archive/value_archive.h" -#include "core/registry.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/resize.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv2/imgproc.hpp" #include "opencv_utils.h" -#include "preprocess/transform/resize.h" -#include "preprocess/transform/transform.h" using namespace std; diff --git a/csrc/codebase/mmocr/warp.cpp b/csrc/mmdeploy/codebase/mmocr/warp.cpp similarity index 91% rename from csrc/codebase/mmocr/warp.cpp rename to csrc/mmdeploy/codebase/mmocr/warp.cpp index 56566f6d12..a8107a2448 100644 --- a/csrc/codebase/mmocr/warp.cpp +++ b/csrc/mmdeploy/codebase/mmocr/warp.cpp @@ -2,12 +2,12 @@ #include -#include "archive/value_archive.h" -#include "core/module.h" -#include "core/registry.h" -#include "core/utils/formatter.h" -#include "core/value.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/experimental/module_adapter.h" #include "opencv_utils.h" namespace mmdeploy { diff --git a/csrc/codebase/mmpose/CMakeLists.txt b/csrc/mmdeploy/codebase/mmpose/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmpose/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmpose/CMakeLists.txt diff --git a/csrc/codebase/mmpose/keypoints_from_heatmap.cpp b/csrc/mmdeploy/codebase/mmpose/keypoints_from_heatmap.cpp similarity index 97% rename from csrc/codebase/mmpose/keypoints_from_heatmap.cpp rename to csrc/mmdeploy/codebase/mmpose/keypoints_from_heatmap.cpp index 72c6a3cf07..7477836e1d 100644 --- a/csrc/codebase/mmpose/keypoints_from_heatmap.cpp +++ b/csrc/mmdeploy/codebase/mmpose/keypoints_from_heatmap.cpp @@ -4,14 +4,14 @@ #include #include -#include "core/device.h" -#include "core/registry.h" -#include "core/serialization.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" -#include "core/value.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/serialization.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/experimental/module_adapter.h" #include "mmpose.h" #include "opencv_utils.h" diff --git a/csrc/codebase/mmpose/keypoints_from_regression.cpp b/csrc/mmdeploy/codebase/mmpose/keypoints_from_regression.cpp similarity index 91% rename from csrc/codebase/mmpose/keypoints_from_regression.cpp rename to csrc/mmdeploy/codebase/mmpose/keypoints_from_regression.cpp index a484b670e8..58fd4c972b 100644 --- a/csrc/codebase/mmpose/keypoints_from_regression.cpp +++ b/csrc/mmdeploy/codebase/mmpose/keypoints_from_regression.cpp @@ -3,14 +3,14 @@ #include #include -#include "core/device.h" -#include "core/registry.h" -#include "core/serialization.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" -#include "core/value.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/serialization.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/experimental/module_adapter.h" #include "mmpose.h" #include "opencv_utils.h" diff --git a/csrc/codebase/mmpose/mmpose.cpp b/csrc/mmdeploy/codebase/mmpose/mmpose.cpp similarity index 82% rename from csrc/codebase/mmpose/mmpose.cpp rename to csrc/mmdeploy/codebase/mmpose/mmpose.cpp index 7d5e048b11..0102ce1b19 100644 --- a/csrc/codebase/mmpose/mmpose.cpp +++ b/csrc/mmdeploy/codebase/mmpose/mmpose.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmpose/mmpose.h" +#include "mmdeploy/codebase/mmpose/mmpose.h" using namespace std; diff --git a/csrc/codebase/mmpose/mmpose.h b/csrc/mmdeploy/codebase/mmpose/mmpose.h similarity index 83% rename from csrc/codebase/mmpose/mmpose.h rename to csrc/mmdeploy/codebase/mmpose/mmpose.h index a658d48947..0c08db7832 100644 --- a/csrc/codebase/mmpose/mmpose.h +++ b/csrc/mmdeploy/codebase/mmpose/mmpose.h @@ -5,9 +5,9 @@ #include -#include "codebase/common.h" -#include "core/device.h" -#include "core/module.h" +#include "mmdeploy/codebase/common.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/module.h" namespace mmdeploy { namespace mmpose { diff --git a/csrc/codebase/mmpose/topdown_affine.cpp b/csrc/mmdeploy/codebase/mmpose/topdown_affine.cpp similarity index 94% rename from csrc/codebase/mmpose/topdown_affine.cpp rename to csrc/mmdeploy/codebase/mmpose/topdown_affine.cpp index ccca01a917..b63dec4d65 100644 --- a/csrc/codebase/mmpose/topdown_affine.cpp +++ b/csrc/mmdeploy/codebase/mmpose/topdown_affine.cpp @@ -2,16 +2,16 @@ #include -#include "archive/json_archive.h" -#include "archive/value_archive.h" -#include "core/registry.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/resize.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv2/imgproc.hpp" #include "opencv_utils.h" -#include "preprocess/transform/resize.h" -#include "preprocess/transform/transform.h" using namespace std; diff --git a/csrc/codebase/mmpose/topdown_get_bbox_center_scale.cpp b/csrc/mmdeploy/codebase/mmpose/topdown_get_bbox_center_scale.cpp similarity index 88% rename from csrc/codebase/mmpose/topdown_get_bbox_center_scale.cpp rename to csrc/mmdeploy/codebase/mmpose/topdown_get_bbox_center_scale.cpp index 83b7c42dc1..3d00385bbd 100644 --- a/csrc/codebase/mmpose/topdown_get_bbox_center_scale.cpp +++ b/csrc/mmdeploy/codebase/mmpose/topdown_get_bbox_center_scale.cpp @@ -2,16 +2,16 @@ #include -#include "archive/json_archive.h" -#include "archive/value_archive.h" -#include "core/registry.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/resize.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv2/imgproc.hpp" #include "opencv_utils.h" -#include "preprocess/transform/resize.h" -#include "preprocess/transform/transform.h" using namespace std; diff --git a/csrc/codebase/mmrotate/CMakeLists.txt b/csrc/mmdeploy/codebase/mmrotate/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmrotate/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmrotate/CMakeLists.txt diff --git a/csrc/codebase/mmrotate/mmrotate.cpp b/csrc/mmdeploy/codebase/mmrotate/mmrotate.cpp similarity index 83% rename from csrc/codebase/mmrotate/mmrotate.cpp rename to csrc/mmdeploy/codebase/mmrotate/mmrotate.cpp index 198458ed65..566d660549 100644 --- a/csrc/codebase/mmrotate/mmrotate.cpp +++ b/csrc/mmdeploy/codebase/mmrotate/mmrotate.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmrotate/mmrotate.h" +#include "mmdeploy/codebase/mmrotate/mmrotate.h" using namespace std; diff --git a/csrc/codebase/mmrotate/mmrotate.h b/csrc/mmdeploy/codebase/mmrotate/mmrotate.h similarity index 85% rename from csrc/codebase/mmrotate/mmrotate.h rename to csrc/mmdeploy/codebase/mmrotate/mmrotate.h index 8b4451af1f..17dbde508f 100644 --- a/csrc/codebase/mmrotate/mmrotate.h +++ b/csrc/mmdeploy/codebase/mmrotate/mmrotate.h @@ -5,9 +5,9 @@ #include -#include "codebase/common.h" -#include "core/device.h" -#include "core/module.h" +#include "mmdeploy/codebase/common.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/module.h" namespace mmdeploy { namespace mmrotate { diff --git a/csrc/codebase/mmrotate/oriented_object_detection.cpp b/csrc/mmdeploy/codebase/mmrotate/oriented_object_detection.cpp similarity index 93% rename from csrc/codebase/mmrotate/oriented_object_detection.cpp rename to csrc/mmdeploy/codebase/mmrotate/oriented_object_detection.cpp index 5f014191f7..45bfd46b6a 100644 --- a/csrc/codebase/mmrotate/oriented_object_detection.cpp +++ b/csrc/mmdeploy/codebase/mmrotate/oriented_object_detection.cpp @@ -3,13 +3,13 @@ #include #include -#include "core/device.h" -#include "core/registry.h" -#include "core/serialization.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" -#include "core/value.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/serialization.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" #include "mmrotate.h" #include "opencv_utils.h" diff --git a/csrc/codebase/mmseg/CMakeLists.txt b/csrc/mmdeploy/codebase/mmseg/CMakeLists.txt similarity index 100% rename from csrc/codebase/mmseg/CMakeLists.txt rename to csrc/mmdeploy/codebase/mmseg/CMakeLists.txt diff --git a/csrc/codebase/mmseg/mmseg.cpp b/csrc/mmdeploy/codebase/mmseg/mmseg.cpp similarity index 84% rename from csrc/codebase/mmseg/mmseg.cpp rename to csrc/mmdeploy/codebase/mmseg/mmseg.cpp index 6f080b8221..0da46a862f 100644 --- a/csrc/codebase/mmseg/mmseg.cpp +++ b/csrc/mmdeploy/codebase/mmseg/mmseg.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmseg/mmseg.h" +#include "mmdeploy/codebase/mmseg/mmseg.h" using namespace std; diff --git a/csrc/codebase/mmseg/mmseg.h b/csrc/mmdeploy/codebase/mmseg/mmseg.h similarity index 76% rename from csrc/codebase/mmseg/mmseg.h rename to csrc/mmdeploy/codebase/mmseg/mmseg.h index 9122047836..cccf35222d 100644 --- a/csrc/codebase/mmseg/mmseg.h +++ b/csrc/mmdeploy/codebase/mmseg/mmseg.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_MMSEG_H #define MMDEPLOY_MMSEG_H -#include "codebase/common.h" -#include "core/device.h" -#include "core/module.h" -#include "core/tensor.h" +#include "mmdeploy/codebase/common.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/tensor.h" namespace mmdeploy { namespace mmseg { diff --git a/csrc/codebase/mmseg/segment.cpp b/csrc/mmdeploy/codebase/mmseg/segment.cpp similarity index 91% rename from csrc/codebase/mmseg/segment.cpp rename to csrc/mmdeploy/codebase/mmseg/segment.cpp index 009ed23d78..a9c4bb3591 100644 --- a/csrc/codebase/mmseg/segment.cpp +++ b/csrc/mmdeploy/codebase/mmseg/segment.cpp @@ -1,12 +1,12 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "codebase/mmseg/mmseg.h" -#include "core/logger.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" +#include "mmdeploy/codebase/mmseg/mmseg.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" namespace mmdeploy::mmseg { diff --git a/csrc/core/CMakeLists.txt b/csrc/mmdeploy/core/CMakeLists.txt similarity index 72% rename from csrc/core/CMakeLists.txt rename to csrc/mmdeploy/core/CMakeLists.txt index e89c5ca8f1..68843cd3c3 100644 --- a/csrc/core/CMakeLists.txt +++ b/csrc/mmdeploy/core/CMakeLists.txt @@ -17,7 +17,8 @@ else () set(SPDLOG_LIB spdlog::spdlog) mmdeploy_export(spdlog) if (MMDEPLOY_BUILD_SDK_CXX_API) - install(DIRECTORY ${MMDEPLOY_SPDLOG_DIR}/include/spdlog DESTINATION include/cpp) + install(DIRECTORY ${MMDEPLOY_SPDLOG_DIR}/include/spdlog + DESTINATION include/mmdeploy/third_party) endif () endif () @@ -51,7 +52,13 @@ target_include_directories(${PROJECT_NAME} if (MMDEPLOY_BUILD_SDK_CXX_API) target_include_directories(${PROJECT_NAME} PUBLIC - $) + $ + $ + $) + if (NOT MMDEPLOY_SPDLOG_EXTERNAL) + target_include_directories(spdlog INTERFACE + $) + endif () endif () target_link_libraries(${PROJECT_NAME} PUBLIC ${SPDLOG_LIB}) @@ -61,13 +68,13 @@ endif () add_library(mmdeploy::core ALIAS ${PROJECT_NAME}) if (MMDEPLOY_BUILD_SDK_CXX_API) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/csrc/core - DESTINATION include/cpp + install(DIRECTORY ${CMAKE_SOURCE_DIR}/csrc/mmdeploy/core + DESTINATION include/mmdeploy FILES_MATCHING PATTERN "*.h") install(FILES ${CMAKE_SOURCE_DIR}/third_party/outcome/outcome-experimental.hpp - DESTINATION include/cpp/core) + DESTINATION include/mmdeploy/third_party/outcome) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/csrc/experimental - DESTINATION include/cpp + install(DIRECTORY ${CMAKE_SOURCE_DIR}/csrc/mmdeploy/experimental + DESTINATION include/mmdeploy FILES_MATCHING PATTERN "*.h") endif () diff --git a/csrc/core/archive.h b/csrc/mmdeploy/core/archive.h similarity index 97% rename from csrc/core/archive.h rename to csrc/mmdeploy/core/archive.h index 99536f059b..a0dde248ba 100644 --- a/csrc/core/archive.h +++ b/csrc/mmdeploy/core/archive.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_SRC_CORE_ARCHIVE_H_ #define MMDEPLOY_SRC_CORE_ARCHIVE_H_ -#include "core/logger.h" -#include "core/serialization.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/serialization.h" namespace mmdeploy { diff --git a/csrc/core/device.h b/csrc/mmdeploy/core/device.h similarity index 99% rename from csrc/core/device.h rename to csrc/mmdeploy/core/device.h index c1713162e1..f301b14ba4 100644 --- a/csrc/core/device.h +++ b/csrc/mmdeploy/core/device.h @@ -10,8 +10,8 @@ #include #include -#include "core/macro.h" -#include "core/status_code.h" +#include "mmdeploy/core/macro.h" +#include "mmdeploy/core/status_code.h" namespace mmdeploy { diff --git a/csrc/core/device_impl.cpp b/csrc/mmdeploy/core/device_impl.cpp similarity index 98% rename from csrc/core/device_impl.cpp rename to csrc/mmdeploy/core/device_impl.cpp index 32ed9e104f..ae708d9339 100644 --- a/csrc/core/device_impl.cpp +++ b/csrc/mmdeploy/core/device_impl.cpp @@ -1,11 +1,11 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "device_impl.h" +#include "mmdeploy/core/device_impl.h" #include -#include "core/device.h" -#include "core/logger.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/logger.h" namespace mmdeploy { diff --git a/csrc/core/device_impl.h b/csrc/mmdeploy/core/device_impl.h similarity index 99% rename from csrc/core/device_impl.h rename to csrc/mmdeploy/core/device_impl.h index 07835aeae6..ea6218d48c 100644 --- a/csrc/core/device_impl.h +++ b/csrc/mmdeploy/core/device_impl.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_SRC_CORE_DEVICE_IMPL_H_ #define MMDEPLOY_SRC_CORE_DEVICE_IMPL_H_ -#include "device.h" +#include "mmdeploy/core/device.h" namespace mmdeploy { diff --git a/csrc/core/graph.cpp b/csrc/mmdeploy/core/graph.cpp similarity index 84% rename from csrc/core/graph.cpp rename to csrc/mmdeploy/core/graph.cpp index f418c46a4e..610037aa79 100644 --- a/csrc/core/graph.cpp +++ b/csrc/mmdeploy/core/graph.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/graph.h" +#include "mmdeploy/core/graph.h" -#include "archive/value_archive.h" -#include "core/registry.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/registry.h" namespace mmdeploy { namespace graph { diff --git a/csrc/core/graph.h b/csrc/mmdeploy/core/graph.h similarity index 78% rename from csrc/core/graph.h rename to csrc/mmdeploy/core/graph.h index 53edccefc2..53d997b6fb 100644 --- a/csrc/core/graph.h +++ b/csrc/mmdeploy/core/graph.h @@ -3,13 +3,13 @@ #ifndef MMDEPLOY_SRC_EXPERIMENTAL_PIPELINE_IR_H_ #define MMDEPLOY_SRC_EXPERIMENTAL_PIPELINE_IR_H_ -#include "core/model.h" -#include "core/module.h" -#include "core/registry.h" -#include "core/status_code.h" -#include "execution/schedulers/registry.h" -#include "mpl/span.h" -#include "utils/formatter.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/mpl/span.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/status_code.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/execution/schedulers/registry.h" namespace mmdeploy { diff --git a/csrc/core/logger.cpp b/csrc/mmdeploy/core/logger.cpp similarity index 100% rename from csrc/core/logger.cpp rename to csrc/mmdeploy/core/logger.cpp diff --git a/csrc/core/logger.h b/csrc/mmdeploy/core/logger.h similarity index 98% rename from csrc/core/logger.h rename to csrc/mmdeploy/core/logger.h index ff326c4511..73de4f0ee1 100644 --- a/csrc/core/logger.h +++ b/csrc/mmdeploy/core/logger.h @@ -5,7 +5,7 @@ #include -#include "core/macro.h" +#include "mmdeploy/core/macro.h" namespace mmdeploy { diff --git a/csrc/core/macro.h b/csrc/mmdeploy/core/macro.h similarity index 100% rename from csrc/core/macro.h rename to csrc/mmdeploy/core/macro.h diff --git a/csrc/core/mat.cpp b/csrc/mmdeploy/core/mat.cpp similarity index 100% rename from csrc/core/mat.cpp rename to csrc/mmdeploy/core/mat.cpp diff --git a/csrc/core/mat.h b/csrc/mmdeploy/core/mat.h similarity index 97% rename from csrc/core/mat.h rename to csrc/mmdeploy/core/mat.h index 4702df7e9e..2341a11ba0 100644 --- a/csrc/core/mat.h +++ b/csrc/mmdeploy/core/mat.h @@ -6,8 +6,8 @@ #include #include -#include "core/device.h" -#include "core/types.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/types.h" namespace mmdeploy { diff --git a/csrc/core/model.cpp b/csrc/mmdeploy/core/model.cpp similarity index 95% rename from csrc/core/model.cpp rename to csrc/mmdeploy/core/model.cpp index 58c756223e..66dae5634d 100644 --- a/csrc/core/model.cpp +++ b/csrc/mmdeploy/core/model.cpp @@ -2,9 +2,9 @@ #include "model.h" -#include "core/logger.h" -#include "core/model_impl.h" -#include "core/utils/filesystem.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model_impl.h" +#include "mmdeploy/core/utils/filesystem.h" using namespace std; diff --git a/csrc/core/model.h b/csrc/mmdeploy/core/model.h similarity index 100% rename from csrc/core/model.h rename to csrc/mmdeploy/core/model.h diff --git a/csrc/core/model_impl.h b/csrc/mmdeploy/core/model_impl.h similarity index 100% rename from csrc/core/model_impl.h rename to csrc/mmdeploy/core/model_impl.h diff --git a/csrc/core/module.cpp b/csrc/mmdeploy/core/module.cpp similarity index 100% rename from csrc/core/module.cpp rename to csrc/mmdeploy/core/module.cpp diff --git a/csrc/core/module.h b/csrc/mmdeploy/core/module.h similarity index 72% rename from csrc/core/module.h rename to csrc/mmdeploy/core/module.h index 6debc6a6dd..5273b3f16d 100644 --- a/csrc/core/module.h +++ b/csrc/mmdeploy/core/module.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_SRC_CORE_MODULE_H_ #define MMDEPLOY_SRC_CORE_MODULE_H_ -#include "core/macro.h" -#include "core/registry.h" -#include "core/status_code.h" -#include "core/value.h" +#include "mmdeploy/core/macro.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/status_code.h" +#include "mmdeploy/core/value.h" namespace mmdeploy { diff --git a/csrc/core/mpl/detected.h b/csrc/mmdeploy/core/mpl/detected.h similarity index 100% rename from csrc/core/mpl/detected.h rename to csrc/mmdeploy/core/mpl/detected.h diff --git a/csrc/core/mpl/iterator.h b/csrc/mmdeploy/core/mpl/iterator.h similarity index 100% rename from csrc/core/mpl/iterator.h rename to csrc/mmdeploy/core/mpl/iterator.h diff --git a/csrc/core/mpl/priority_tag.h b/csrc/mmdeploy/core/mpl/priority_tag.h similarity index 100% rename from csrc/core/mpl/priority_tag.h rename to csrc/mmdeploy/core/mpl/priority_tag.h diff --git a/csrc/core/mpl/span.h b/csrc/mmdeploy/core/mpl/span.h similarity index 100% rename from csrc/core/mpl/span.h rename to csrc/mmdeploy/core/mpl/span.h diff --git a/csrc/core/mpl/static_any.h b/csrc/mmdeploy/core/mpl/static_any.h similarity index 100% rename from csrc/core/mpl/static_any.h rename to csrc/mmdeploy/core/mpl/static_any.h diff --git a/csrc/core/mpl/type_traits.h b/csrc/mmdeploy/core/mpl/type_traits.h similarity index 100% rename from csrc/core/mpl/type_traits.h rename to csrc/mmdeploy/core/mpl/type_traits.h diff --git a/csrc/core/net.cpp b/csrc/mmdeploy/core/net.cpp similarity index 100% rename from csrc/core/net.cpp rename to csrc/mmdeploy/core/net.cpp diff --git a/csrc/core/net.h b/csrc/mmdeploy/core/net.h similarity index 100% rename from csrc/core/net.h rename to csrc/mmdeploy/core/net.h diff --git a/csrc/core/operator.cpp b/csrc/mmdeploy/core/operator.cpp similarity index 100% rename from csrc/core/operator.cpp rename to csrc/mmdeploy/core/operator.cpp diff --git a/csrc/core/operator.h b/csrc/mmdeploy/core/operator.h similarity index 99% rename from csrc/core/operator.h rename to csrc/mmdeploy/core/operator.h index ff5d5e59ca..39c810da54 100644 --- a/csrc/core/operator.h +++ b/csrc/mmdeploy/core/operator.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_SRC_EXPERIMENTAL_PIPELINE_OPERATOR_H_ #define MMDEPLOY_SRC_EXPERIMENTAL_PIPELINE_OPERATOR_H_ -#include "core/value.h" +#include "mmdeploy/core/value.h" namespace mmdeploy::graph { diff --git a/csrc/core/registry.cpp b/csrc/mmdeploy/core/registry.cpp similarity index 96% rename from csrc/core/registry.cpp rename to csrc/mmdeploy/core/registry.cpp index d0d543ee5d..4d404138ae 100644 --- a/csrc/core/registry.cpp +++ b/csrc/mmdeploy/core/registry.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/registry.h" +#include "mmdeploy/core/registry.h" namespace mmdeploy { diff --git a/csrc/core/registry.h b/csrc/mmdeploy/core/registry.h similarity index 100% rename from csrc/core/registry.h rename to csrc/mmdeploy/core/registry.h diff --git a/csrc/core/serialization.h b/csrc/mmdeploy/core/serialization.h similarity index 98% rename from csrc/core/serialization.h rename to csrc/mmdeploy/core/serialization.h index 6a37d8c3ff..a8c2f93e1f 100644 --- a/csrc/core/serialization.h +++ b/csrc/mmdeploy/core/serialization.h @@ -8,10 +8,10 @@ #include #include -#include "core/macro.h" -#include "core/status_code.h" -#include "mpl/detected.h" -#include "mpl/type_traits.h" +#include "mmdeploy/core/macro.h" +#include "mmdeploy/core/mpl/detected.h" +#include "mmdeploy/core/mpl/type_traits.h" +#include "mmdeploy/core/status_code.h" namespace mmdeploy { diff --git a/csrc/core/status_code.cpp b/csrc/mmdeploy/core/status_code.cpp similarity index 94% rename from csrc/core/status_code.cpp rename to csrc/mmdeploy/core/status_code.cpp index ace504ed8a..1654f4caf4 100644 --- a/csrc/core/status_code.cpp +++ b/csrc/mmdeploy/core/status_code.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/status_code.h" +#include "mmdeploy/core/status_code.h" -#include "core/logger.h" +#include "mmdeploy/core/logger.h" namespace mmdeploy { diff --git a/csrc/core/status_code.h b/csrc/mmdeploy/core/status_code.h similarity index 98% rename from csrc/core/status_code.h rename to csrc/mmdeploy/core/status_code.h index f84ce8a886..e68b5a1a4a 100644 --- a/csrc/core/status_code.h +++ b/csrc/mmdeploy/core/status_code.h @@ -5,12 +5,12 @@ #include -#include "core/macro.h" +#include "mmdeploy/core/macro.h" #include "outcome-experimental.hpp" #if MMDEPLOY_STATUS_USE_SOURCE_LOCATION -#include "utils/source_location.h" +#include "mmdeploy/core/utils/source_location.h" #elif MMDEPLOY_STATUS_USE_STACKTRACE -#include "utils/stacktrace.h" +#include "mmdeploy/core/utils/stacktrace.h" #endif namespace mmdeploy { diff --git a/csrc/core/tensor.cpp b/csrc/mmdeploy/core/tensor.cpp similarity index 98% rename from csrc/core/tensor.cpp rename to csrc/mmdeploy/core/tensor.cpp index 3376556e4c..ddbb08252c 100644 --- a/csrc/core/tensor.cpp +++ b/csrc/mmdeploy/core/tensor.cpp @@ -6,8 +6,8 @@ #include #include -#include "core/utils/formatter.h" -#include "logger.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/utils/formatter.h" using std::stringstream; diff --git a/csrc/core/tensor.h b/csrc/mmdeploy/core/tensor.h similarity index 96% rename from csrc/core/tensor.h rename to csrc/mmdeploy/core/tensor.h index 353e23c147..92403fe38e 100644 --- a/csrc/core/tensor.h +++ b/csrc/mmdeploy/core/tensor.h @@ -6,8 +6,8 @@ #include #include -#include "device.h" -#include "types.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/types.h" namespace mmdeploy { diff --git a/csrc/core/types.h b/csrc/mmdeploy/core/types.h similarity index 100% rename from csrc/core/types.h rename to csrc/mmdeploy/core/types.h diff --git a/csrc/core/utils/device_utils.cpp b/csrc/mmdeploy/core/utils/device_utils.cpp similarity index 92% rename from csrc/core/utils/device_utils.cpp rename to csrc/mmdeploy/core/utils/device_utils.cpp index 561cc2f09f..b57aba8173 100644 --- a/csrc/core/utils/device_utils.cpp +++ b/csrc/mmdeploy/core/utils/device_utils.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "device_utils.h" +#include "mmdeploy/core/utils/device_utils.h" -#include "core/logger.h" +#include "mmdeploy/core/logger.h" namespace mmdeploy { diff --git a/csrc/core/utils/device_utils.h b/csrc/mmdeploy/core/utils/device_utils.h similarity index 95% rename from csrc/core/utils/device_utils.h rename to csrc/mmdeploy/core/utils/device_utils.h index 5748dab5ba..065729c24e 100644 --- a/csrc/core/utils/device_utils.h +++ b/csrc/mmdeploy/core/utils/device_utils.h @@ -5,8 +5,8 @@ #include -#include "core/mat.h" -#include "core/tensor.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/tensor.h" namespace mmdeploy { /** diff --git a/csrc/core/utils/filesystem.h b/csrc/mmdeploy/core/utils/filesystem.h similarity index 100% rename from csrc/core/utils/filesystem.h rename to csrc/mmdeploy/core/utils/filesystem.h diff --git a/csrc/core/utils/formatter.cpp b/csrc/mmdeploy/core/utils/formatter.cpp similarity index 61% rename from csrc/core/utils/formatter.cpp rename to csrc/mmdeploy/core/utils/formatter.cpp index b37972bb4f..9e78a9038e 100644 --- a/csrc/core/utils/formatter.cpp +++ b/csrc/mmdeploy/core/utils/formatter.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/formatter.h" +#include "mmdeploy/core/utils/formatter.h" -#include "archive/json_archive.h" -#include "core/value.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/value.h" namespace mmdeploy { diff --git a/csrc/core/utils/formatter.h b/csrc/mmdeploy/core/utils/formatter.h similarity index 97% rename from csrc/core/utils/formatter.h rename to csrc/mmdeploy/core/utils/formatter.h index 984a8aac8e..ee5c065712 100644 --- a/csrc/core/utils/formatter.h +++ b/csrc/mmdeploy/core/utils/formatter.h @@ -6,8 +6,8 @@ #include #include -#include "core/logger.h" -#include "core/types.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/types.h" #include "spdlog/fmt/ostr.h" #if FMT_VERSION >= 50000 diff --git a/csrc/core/utils/scope_counter.h b/csrc/mmdeploy/core/utils/scope_counter.h similarity index 100% rename from csrc/core/utils/scope_counter.h rename to csrc/mmdeploy/core/utils/scope_counter.h diff --git a/csrc/core/utils/source_location.h b/csrc/mmdeploy/core/utils/source_location.h similarity index 100% rename from csrc/core/utils/source_location.h rename to csrc/mmdeploy/core/utils/source_location.h diff --git a/csrc/core/utils/stacktrace.cpp b/csrc/mmdeploy/core/utils/stacktrace.cpp similarity index 97% rename from csrc/core/utils/stacktrace.cpp rename to csrc/mmdeploy/core/utils/stacktrace.cpp index 38cc401b41..dd38825ae8 100644 --- a/csrc/core/utils/stacktrace.cpp +++ b/csrc/mmdeploy/core/utils/stacktrace.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/stacktrace.h" +#include "mmdeploy/core/utils/stacktrace.h" #if USE_BOOST_STACKTRACE diff --git a/csrc/core/utils/stacktrace.h b/csrc/mmdeploy/core/utils/stacktrace.h similarity index 100% rename from csrc/core/utils/stacktrace.h rename to csrc/mmdeploy/core/utils/stacktrace.h diff --git a/csrc/core/value.h b/csrc/mmdeploy/core/value.h similarity index 99% rename from csrc/core/value.h rename to csrc/mmdeploy/core/value.h index fe5ae559e9..7d79d95a46 100644 --- a/csrc/core/value.h +++ b/csrc/mmdeploy/core/value.h @@ -12,11 +12,11 @@ #include #include -#include "core/logger.h" -#include "core/status_code.h" -#include "mpl/priority_tag.h" -#include "mpl/static_any.h" -#include "mpl/type_traits.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/mpl/priority_tag.h" +#include "mmdeploy/core/mpl/static_any.h" +#include "mmdeploy/core/mpl/type_traits.h" +#include "mmdeploy/core/status_code.h" namespace mmdeploy { diff --git a/csrc/device/CMakeLists.txt b/csrc/mmdeploy/device/CMakeLists.txt similarity index 100% rename from csrc/device/CMakeLists.txt rename to csrc/mmdeploy/device/CMakeLists.txt diff --git a/csrc/device/cpu/CMakeLists.txt b/csrc/mmdeploy/device/cpu/CMakeLists.txt similarity index 100% rename from csrc/device/cpu/CMakeLists.txt rename to csrc/mmdeploy/device/cpu/CMakeLists.txt diff --git a/csrc/device/cpu/cpu_device.cpp b/csrc/mmdeploy/device/cpu/cpu_device.cpp similarity index 99% rename from csrc/device/cpu/cpu_device.cpp rename to csrc/mmdeploy/device/cpu/cpu_device.cpp index a9063fe6d4..1fd21ccd8c 100644 --- a/csrc/device/cpu/cpu_device.cpp +++ b/csrc/mmdeploy/device/cpu/cpu_device.cpp @@ -5,7 +5,6 @@ #include #include -#include "core/logger.h" namespace mmdeploy { class CpuHostMemory : public NonCopyable { diff --git a/csrc/device/cpu/cpu_device.h b/csrc/mmdeploy/device/cpu/cpu_device.h similarity index 98% rename from csrc/device/cpu/cpu_device.h rename to csrc/mmdeploy/device/cpu/cpu_device.h index 92c00091a4..29a5bdfffd 100644 --- a/csrc/device/cpu/cpu_device.h +++ b/csrc/mmdeploy/device/cpu/cpu_device.h @@ -6,8 +6,8 @@ #include #include -#include "core/device_impl.h" -#include "core/types.h" +#include "mmdeploy/core/device_impl.h" +#include "mmdeploy/core/types.h" namespace mmdeploy { diff --git a/csrc/device/cuda/CMakeLists.txt b/csrc/mmdeploy/device/cuda/CMakeLists.txt similarity index 100% rename from csrc/device/cuda/CMakeLists.txt rename to csrc/mmdeploy/device/cuda/CMakeLists.txt diff --git a/csrc/device/cuda/buddy_allocator.h b/csrc/mmdeploy/device/cuda/buddy_allocator.h similarity index 98% rename from csrc/device/cuda/buddy_allocator.h rename to csrc/mmdeploy/device/cuda/buddy_allocator.h index 3e26a0edff..8525c5562f 100644 --- a/csrc/device/cuda/buddy_allocator.h +++ b/csrc/mmdeploy/device/cuda/buddy_allocator.h @@ -11,8 +11,8 @@ #include #include -#include "core/logger.h" -#include "device/cuda/default_allocator.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/device/cuda/default_allocator.h" namespace mmdeploy::cuda { diff --git a/csrc/device/cuda/cuda_builtin_kernels.cu b/csrc/mmdeploy/device/cuda/cuda_builtin_kernels.cu similarity index 100% rename from csrc/device/cuda/cuda_builtin_kernels.cu rename to csrc/mmdeploy/device/cuda/cuda_builtin_kernels.cu diff --git a/csrc/device/cuda/cuda_device.cpp b/csrc/mmdeploy/device/cuda/cuda_device.cpp similarity index 99% rename from csrc/device/cuda/cuda_device.cpp rename to csrc/mmdeploy/device/cuda/cuda_device.cpp index 0b8eebae44..a29bd6f95b 100644 --- a/csrc/device/cuda/cuda_device.cpp +++ b/csrc/mmdeploy/device/cuda/cuda_device.cpp @@ -4,7 +4,7 @@ #include -#include "device/device_allocator.h" +#include "mmdeploy/device/device_allocator.h" namespace mmdeploy { diff --git a/csrc/device/cuda/cuda_device.h b/csrc/mmdeploy/device/cuda/cuda_device.h similarity index 98% rename from csrc/device/cuda/cuda_device.h rename to csrc/mmdeploy/device/cuda/cuda_device.h index f9cdc2cdf5..3e36392d57 100644 --- a/csrc/device/cuda/cuda_device.h +++ b/csrc/mmdeploy/device/cuda/cuda_device.h @@ -3,10 +3,10 @@ #include #include -#include "core/device_impl.h" -#include "core/types.h" #include "cuda.h" #include "cuda_runtime.h" +#include "mmdeploy/core/device_impl.h" +#include "mmdeploy/core/types.h" namespace mmdeploy { diff --git a/csrc/device/cuda/default_allocator.h b/csrc/mmdeploy/device/cuda/default_allocator.h similarity index 98% rename from csrc/device/cuda/default_allocator.h rename to csrc/mmdeploy/device/cuda/default_allocator.h index a8b2177ccc..50fe68b2c5 100644 --- a/csrc/device/cuda/default_allocator.h +++ b/csrc/mmdeploy/device/cuda/default_allocator.h @@ -8,7 +8,7 @@ #include #include -#include "core/logger.h" +#include "mmdeploy/core/logger.h" namespace mmdeploy::cuda { diff --git a/csrc/device/cuda/linear_allocator.h b/csrc/mmdeploy/device/cuda/linear_allocator.h similarity index 100% rename from csrc/device/cuda/linear_allocator.h rename to csrc/mmdeploy/device/cuda/linear_allocator.h diff --git a/csrc/device/device_allocator.h b/csrc/mmdeploy/device/device_allocator.h similarity index 99% rename from csrc/device/device_allocator.h rename to csrc/mmdeploy/device/device_allocator.h index 06bb5730df..95f54be3be 100644 --- a/csrc/device/device_allocator.h +++ b/csrc/mmdeploy/device/device_allocator.h @@ -10,8 +10,8 @@ #include #include -#include "core/device_impl.h" -#include "core/logger.h" +#include "mmdeploy/core/device_impl.h" +#include "mmdeploy/core/logger.h" namespace mmdeploy::device_allocator { diff --git a/csrc/execution/CMakeLists.txt b/csrc/mmdeploy/execution/CMakeLists.txt similarity index 100% rename from csrc/execution/CMakeLists.txt rename to csrc/mmdeploy/execution/CMakeLists.txt diff --git a/csrc/execution/bulk.h b/csrc/mmdeploy/execution/bulk.h similarity index 99% rename from csrc/execution/bulk.h rename to csrc/mmdeploy/execution/bulk.h index f62cc03ddc..32e4d2be32 100644 --- a/csrc/execution/bulk.h +++ b/csrc/mmdeploy/execution/bulk.h @@ -7,7 +7,7 @@ #include "closure.h" #include "concepts.h" -#include "core/logger.h" +#include "mmdeploy/core/logger.h" #include "utility.h" namespace mmdeploy { diff --git a/csrc/execution/closure.h b/csrc/mmdeploy/execution/closure.h similarity index 100% rename from csrc/execution/closure.h rename to csrc/mmdeploy/execution/closure.h diff --git a/csrc/execution/concepts.h b/csrc/mmdeploy/execution/concepts.h similarity index 100% rename from csrc/execution/concepts.h rename to csrc/mmdeploy/execution/concepts.h diff --git a/csrc/execution/dynamic_batch.h b/csrc/mmdeploy/execution/dynamic_batch.h similarity index 96% rename from csrc/execution/dynamic_batch.h rename to csrc/mmdeploy/execution/dynamic_batch.h index cd43482cc8..6f43fd9a46 100644 --- a/csrc/execution/dynamic_batch.h +++ b/csrc/mmdeploy/execution/dynamic_batch.h @@ -5,8 +5,8 @@ #include -#include "execution/then.h" -#include "execution/utility.h" +#include "mmdeploy/execution/then.h" +#include "mmdeploy/execution/utility.h" namespace mmdeploy { diff --git a/csrc/execution/ensure_started.h b/csrc/mmdeploy/execution/ensure_started.h similarity index 100% rename from csrc/execution/ensure_started.h rename to csrc/mmdeploy/execution/ensure_started.h diff --git a/csrc/execution/execute.h b/csrc/mmdeploy/execution/execute.h similarity index 89% rename from csrc/execution/execute.h rename to csrc/mmdeploy/execution/execute.h index 28c555db89..1b26528912 100644 --- a/csrc/execution/execute.h +++ b/csrc/mmdeploy/execution/execute.h @@ -5,9 +5,9 @@ #ifndef MMDEPLOY_CSRC_EXECUTION_EXECUTE_H_ #define MMDEPLOY_CSRC_EXECUTION_EXECUTE_H_ -#include "execution/start_detached.h" -#include "execution/then.h" -#include "execution/utility.h" +#include "mmdeploy/execution/start_detached.h" +#include "mmdeploy/execution/then.h" +#include "mmdeploy/execution/utility.h" namespace mmdeploy { diff --git a/csrc/execution/execution.h b/csrc/mmdeploy/execution/execution.h similarity index 100% rename from csrc/execution/execution.h rename to csrc/mmdeploy/execution/execution.h diff --git a/csrc/execution/expand.h b/csrc/mmdeploy/execution/expand.h similarity index 100% rename from csrc/execution/expand.h rename to csrc/mmdeploy/execution/expand.h diff --git a/csrc/execution/just.h b/csrc/mmdeploy/execution/just.h similarity index 100% rename from csrc/execution/just.h rename to csrc/mmdeploy/execution/just.h diff --git a/csrc/execution/let_value.h b/csrc/mmdeploy/execution/let_value.h similarity index 100% rename from csrc/execution/let_value.h rename to csrc/mmdeploy/execution/let_value.h diff --git a/csrc/execution/on.h b/csrc/mmdeploy/execution/on.h similarity index 100% rename from csrc/execution/on.h rename to csrc/mmdeploy/execution/on.h diff --git a/csrc/execution/run_loop.h b/csrc/mmdeploy/execution/run_loop.h similarity index 100% rename from csrc/execution/run_loop.h rename to csrc/mmdeploy/execution/run_loop.h diff --git a/csrc/execution/schedule_from.h b/csrc/mmdeploy/execution/schedule_from.h similarity index 100% rename from csrc/execution/schedule_from.h rename to csrc/mmdeploy/execution/schedule_from.h diff --git a/csrc/execution/schedulers/dynamic_batch_scheduler.h b/csrc/mmdeploy/execution/schedulers/dynamic_batch_scheduler.h similarity index 98% rename from csrc/execution/schedulers/dynamic_batch_scheduler.h rename to csrc/mmdeploy/execution/schedulers/dynamic_batch_scheduler.h index 730871ae0b..564048b3fa 100644 --- a/csrc/execution/schedulers/dynamic_batch_scheduler.h +++ b/csrc/mmdeploy/execution/schedulers/dynamic_batch_scheduler.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_CSRC_EXECUTION_SCHEDULERS_DYNAMIC_BATCH_SCHEDULER_H_ #define MMDEPLOY_CSRC_EXECUTION_SCHEDULERS_DYNAMIC_BATCH_SCHEDULER_H_ -#include "core/utils/formatter.h" -#include "execution/dynamic_batch.h" -#include "execution/schedulers/timed_single_thread_context.h" -#include "execution/utility.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/execution/dynamic_batch.h" +#include "mmdeploy/execution/schedulers/timed_single_thread_context.h" +#include "mmdeploy/execution/utility.h" namespace mmdeploy { diff --git a/csrc/execution/schedulers/inlined_scheduler.h b/csrc/mmdeploy/execution/schedulers/inlined_scheduler.h similarity index 97% rename from csrc/execution/schedulers/inlined_scheduler.h rename to csrc/mmdeploy/execution/schedulers/inlined_scheduler.h index fbabbd6dee..3a4b06dd73 100644 --- a/csrc/execution/schedulers/inlined_scheduler.h +++ b/csrc/mmdeploy/execution/schedulers/inlined_scheduler.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_CSRC_EXPERIMENTAL_EXECUTION_INLINED_SCHEDULER_H_ #define MMDEPLOY_CSRC_EXPERIMENTAL_EXECUTION_INLINED_SCHEDULER_H_ -#include "execution/execution.h" +#include "mmdeploy/execution/execution.h" namespace mmdeploy { diff --git a/csrc/execution/schedulers/intrusive_queue.h b/csrc/mmdeploy/execution/schedulers/intrusive_queue.h similarity index 100% rename from csrc/execution/schedulers/intrusive_queue.h rename to csrc/mmdeploy/execution/schedulers/intrusive_queue.h diff --git a/csrc/execution/schedulers/registry.h b/csrc/mmdeploy/execution/schedulers/registry.h similarity index 88% rename from csrc/execution/schedulers/registry.h rename to csrc/mmdeploy/execution/schedulers/registry.h index bfdd275b10..9f4915d135 100644 --- a/csrc/execution/schedulers/registry.h +++ b/csrc/mmdeploy/execution/schedulers/registry.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_CSRC_EXECUTION_SCHEDULERS_REGISTRY_H_ #define MMDEPLOY_CSRC_EXECUTION_SCHEDULERS_REGISTRY_H_ -#include "core/registry.h" -#include "execution/type_erased.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/execution/type_erased.h" namespace mmdeploy { diff --git a/csrc/execution/schedulers/schedulers.cpp b/csrc/mmdeploy/execution/schedulers/schedulers.cpp similarity index 92% rename from csrc/execution/schedulers/schedulers.cpp rename to csrc/mmdeploy/execution/schedulers/schedulers.cpp index a576de9c48..5773b9bd3b 100644 --- a/csrc/execution/schedulers/schedulers.cpp +++ b/csrc/mmdeploy/execution/schedulers/schedulers.cpp @@ -1,11 +1,11 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "execution/schedulers/dynamic_batch_scheduler.h" -#include "execution/schedulers/inlined_scheduler.h" -#include "execution/schedulers/registry.h" -#include "execution/schedulers/single_thread_context.h" -#include "execution/schedulers/static_thread_pool.h" -#include "execution/schedulers/timed_single_thread_context.h" +#include "mmdeploy/execution/schedulers/dynamic_batch_scheduler.h" +#include "mmdeploy/execution/schedulers/inlined_scheduler.h" +#include "mmdeploy/execution/schedulers/registry.h" +#include "mmdeploy/execution/schedulers/single_thread_context.h" +#include "mmdeploy/execution/schedulers/static_thread_pool.h" +#include "mmdeploy/execution/schedulers/timed_single_thread_context.h" namespace mmdeploy { diff --git a/csrc/execution/schedulers/single_thread_context.h b/csrc/mmdeploy/execution/schedulers/single_thread_context.h similarity index 97% rename from csrc/execution/schedulers/single_thread_context.h rename to csrc/mmdeploy/execution/schedulers/single_thread_context.h index b271fe5d99..ebcba774ab 100644 --- a/csrc/execution/schedulers/single_thread_context.h +++ b/csrc/mmdeploy/execution/schedulers/single_thread_context.h @@ -7,7 +7,7 @@ #include -#include "execution/run_loop.h" +#include "mmdeploy/execution/run_loop.h" namespace mmdeploy { diff --git a/csrc/execution/schedulers/static_thread_pool.h b/csrc/mmdeploy/execution/schedulers/static_thread_pool.h similarity index 99% rename from csrc/execution/schedulers/static_thread_pool.h rename to csrc/mmdeploy/execution/schedulers/static_thread_pool.h index 7a0ea17870..3aebc5ac99 100644 --- a/csrc/execution/schedulers/static_thread_pool.h +++ b/csrc/mmdeploy/execution/schedulers/static_thread_pool.h @@ -12,8 +12,8 @@ #include #include -#include "execution/execution.h" #include "intrusive_queue.h" +#include "mmdeploy/execution/execution.h" namespace mmdeploy { diff --git a/csrc/execution/schedulers/timed_single_thread_context.h b/csrc/mmdeploy/execution/schedulers/timed_single_thread_context.h similarity index 99% rename from csrc/execution/schedulers/timed_single_thread_context.h rename to csrc/mmdeploy/execution/schedulers/timed_single_thread_context.h index ac8169748c..706d6d9808 100644 --- a/csrc/execution/schedulers/timed_single_thread_context.h +++ b/csrc/mmdeploy/execution/schedulers/timed_single_thread_context.h @@ -4,7 +4,7 @@ #pragma once -#include "execution/execution.h" +#include "mmdeploy/execution/execution.h" namespace mmdeploy { diff --git a/csrc/execution/split.h b/csrc/mmdeploy/execution/split.h similarity index 100% rename from csrc/execution/split.h rename to csrc/mmdeploy/execution/split.h diff --git a/csrc/execution/start_detached.h b/csrc/mmdeploy/execution/start_detached.h similarity index 100% rename from csrc/execution/start_detached.h rename to csrc/mmdeploy/execution/start_detached.h diff --git a/csrc/execution/submit.h b/csrc/mmdeploy/execution/submit.h similarity index 100% rename from csrc/execution/submit.h rename to csrc/mmdeploy/execution/submit.h diff --git a/csrc/execution/sync_wait.h b/csrc/mmdeploy/execution/sync_wait.h similarity index 100% rename from csrc/execution/sync_wait.h rename to csrc/mmdeploy/execution/sync_wait.h diff --git a/csrc/execution/tag_invoke.h b/csrc/mmdeploy/execution/tag_invoke.h similarity index 100% rename from csrc/execution/tag_invoke.h rename to csrc/mmdeploy/execution/tag_invoke.h diff --git a/csrc/execution/then.h b/csrc/mmdeploy/execution/then.h similarity index 100% rename from csrc/execution/then.h rename to csrc/mmdeploy/execution/then.h diff --git a/csrc/execution/transfer.h b/csrc/mmdeploy/execution/transfer.h similarity index 100% rename from csrc/execution/transfer.h rename to csrc/mmdeploy/execution/transfer.h diff --git a/csrc/execution/transfer_just.h b/csrc/mmdeploy/execution/transfer_just.h similarity index 90% rename from csrc/execution/transfer_just.h rename to csrc/mmdeploy/execution/transfer_just.h index 5456f85de0..693455b742 100644 --- a/csrc/execution/transfer_just.h +++ b/csrc/mmdeploy/execution/transfer_just.h @@ -5,9 +5,9 @@ #ifndef MMDEPLOY_CSRC_EXECUTION_TRANSFER_JUST_H_ #define MMDEPLOY_CSRC_EXECUTION_TRANSFER_JUST_H_ -#include "execution/just.h" -#include "execution/transfer.h" -#include "execution/utility.h" +#include "mmdeploy/execution/just.h" +#include "mmdeploy/execution/transfer.h" +#include "mmdeploy/execution/utility.h" namespace mmdeploy { diff --git a/csrc/execution/type_erased.h b/csrc/mmdeploy/execution/type_erased.h similarity index 99% rename from csrc/execution/type_erased.h rename to csrc/mmdeploy/execution/type_erased.h index e730ac538e..53a38f4bea 100644 --- a/csrc/execution/type_erased.h +++ b/csrc/mmdeploy/execution/type_erased.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_CSRC_EXPERIMENTAL_EXECUTION_TYPE_ERASED_H_ #define MMDEPLOY_CSRC_EXPERIMENTAL_EXECUTION_TYPE_ERASED_H_ -#include "execution/execution.h" +#include "mmdeploy/execution/execution.h" // ! DO NOT INCLUDE THIS FILE DIRECTLY IF SPECIALIZATION OF `capture_completion_scheduler` IS // NEEDED, ALL TRANSLATION UNITS MUST SEE THE SAME SPECIALIZATION diff --git a/csrc/execution/type_traits.h b/csrc/mmdeploy/execution/type_traits.h similarity index 100% rename from csrc/execution/type_traits.h rename to csrc/mmdeploy/execution/type_traits.h diff --git a/csrc/execution/utility.h b/csrc/mmdeploy/execution/utility.h similarity index 98% rename from csrc/execution/utility.h rename to csrc/mmdeploy/execution/utility.h index 99f9446ed1..5a0bb795d8 100644 --- a/csrc/execution/utility.h +++ b/csrc/mmdeploy/execution/utility.h @@ -8,7 +8,7 @@ #include #include -#include "core/mpl/detected.h" +#include "mmdeploy/core/mpl/detected.h" #include "tag_invoke.h" #define MMDEPLOY_REQUIRES(...) std::enable_if_t<__VA_ARGS__, int> = 0 diff --git a/csrc/execution/when_all.h b/csrc/mmdeploy/execution/when_all.h similarity index 100% rename from csrc/execution/when_all.h rename to csrc/mmdeploy/execution/when_all.h diff --git a/csrc/execution/when_all_value.h b/csrc/mmdeploy/execution/when_all_value.h similarity index 96% rename from csrc/execution/when_all_value.h rename to csrc/mmdeploy/execution/when_all_value.h index 59ff865db6..b059937995 100644 --- a/csrc/execution/when_all_value.h +++ b/csrc/mmdeploy/execution/when_all_value.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_CSRC_EXPERIMENTAL_EXECUTION_WHEN_ALL_VALUE_H_ #define MMDEPLOY_CSRC_EXPERIMENTAL_EXECUTION_WHEN_ALL_VALUE_H_ -#include "core/value.h" -#include "execution/schedulers/registry.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/execution/schedulers/registry.h" namespace mmdeploy { diff --git a/csrc/experimental/module_adapter.h b/csrc/mmdeploy/experimental/module_adapter.h similarity index 97% rename from csrc/experimental/module_adapter.h rename to csrc/mmdeploy/experimental/module_adapter.h index 581e7f2bea..e5e2985ec2 100644 --- a/csrc/experimental/module_adapter.h +++ b/csrc/mmdeploy/experimental/module_adapter.h @@ -3,9 +3,9 @@ #ifndef MMDEPLOY_SRC_EXPERIMENTAL_MODULE_ADAPTER_H_ #define MMDEPLOY_SRC_EXPERIMENTAL_MODULE_ADAPTER_H_ -#include "archive/value_archive.h" -#include "core/module.h" -#include "core/mpl/type_traits.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/mpl/type_traits.h" namespace mmdeploy { diff --git a/csrc/graph/CMakeLists.txt b/csrc/mmdeploy/graph/CMakeLists.txt similarity index 100% rename from csrc/graph/CMakeLists.txt rename to csrc/mmdeploy/graph/CMakeLists.txt diff --git a/csrc/graph/common.cpp b/csrc/mmdeploy/graph/common.cpp similarity index 89% rename from csrc/graph/common.cpp rename to csrc/mmdeploy/graph/common.cpp index fba4b23619..73023f50e7 100644 --- a/csrc/graph/common.cpp +++ b/csrc/mmdeploy/graph/common.cpp @@ -2,7 +2,7 @@ #include "common.h" -#include "archive/value_archive.h" +#include "mmdeploy/archive/value_archive.h" mmdeploy::graph::BaseNode::BaseNode(const mmdeploy::Value& cfg) { try { diff --git a/csrc/graph/common.h b/csrc/mmdeploy/graph/common.h similarity index 89% rename from csrc/graph/common.h rename to csrc/mmdeploy/graph/common.h index 46dad62b5d..1b8dd9e5c3 100644 --- a/csrc/graph/common.h +++ b/csrc/mmdeploy/graph/common.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_SRC_GRAPH_COMMON_H_ #define MMDEPLOY_SRC_GRAPH_COMMON_H_ -#include "core/graph.h" -#include "core/module.h" -#include "core/registry.h" -#include "core/value.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/value.h" namespace mmdeploy::graph { diff --git a/csrc/graph/flatten.cpp b/csrc/mmdeploy/graph/flatten.cpp similarity index 91% rename from csrc/graph/flatten.cpp rename to csrc/mmdeploy/graph/flatten.cpp index 44d6131a53..b7f340ddd3 100644 --- a/csrc/graph/flatten.cpp +++ b/csrc/mmdeploy/graph/flatten.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "archive/value_archive.h" -#include "core/graph.h" -#include "core/operator.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/operator.h" namespace mmdeploy::graph { diff --git a/csrc/graph/inference.cpp b/csrc/mmdeploy/graph/inference.cpp similarity index 94% rename from csrc/graph/inference.cpp rename to csrc/mmdeploy/graph/inference.cpp index 709f0ae0f2..8e7b3c2d8d 100644 --- a/csrc/graph/inference.cpp +++ b/csrc/mmdeploy/graph/inference.cpp @@ -2,8 +2,8 @@ #include "inference.h" -#include "archive/json_archive.h" -#include "core/model.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/model.h" namespace mmdeploy::graph { diff --git a/csrc/graph/inference.h b/csrc/mmdeploy/graph/inference.h similarity index 100% rename from csrc/graph/inference.h rename to csrc/mmdeploy/graph/inference.h diff --git a/csrc/graph/pipeline.cpp b/csrc/mmdeploy/graph/pipeline.cpp similarity index 97% rename from csrc/graph/pipeline.cpp rename to csrc/mmdeploy/graph/pipeline.cpp index ad8c16cdc1..dfa098f24b 100644 --- a/csrc/graph/pipeline.cpp +++ b/csrc/mmdeploy/graph/pipeline.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "graph/pipeline.h" +#include "mmdeploy/graph/pipeline.h" -#include "archive/value_archive.h" -#include "execution/schedulers/inlined_scheduler.h" -#include "graph/common.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/execution/schedulers/inlined_scheduler.h" +#include "mmdeploy/graph/common.h" namespace mmdeploy::graph { diff --git a/csrc/graph/pipeline.h b/csrc/mmdeploy/graph/pipeline.h similarity index 83% rename from csrc/graph/pipeline.h rename to csrc/mmdeploy/graph/pipeline.h index 28d54b1a66..c26a87a66b 100644 --- a/csrc/graph/pipeline.h +++ b/csrc/mmdeploy/graph/pipeline.h @@ -5,12 +5,12 @@ #include -#include "core/graph.h" -#include "core/module.h" -#include "core/operator.h" -#include "core/value.h" -#include "execution/schedulers/registry.h" -#include "execution/when_all_value.h" +#include "mmdeploy/core/graph.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/operator.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/execution/schedulers/registry.h" +#include "mmdeploy/execution/when_all_value.h" namespace mmdeploy::graph { diff --git a/csrc/graph/task.cpp b/csrc/mmdeploy/graph/task.cpp similarity index 96% rename from csrc/graph/task.cpp rename to csrc/mmdeploy/graph/task.cpp index 6d0d2fa7f0..41f1ff69d9 100644 --- a/csrc/graph/task.cpp +++ b/csrc/mmdeploy/graph/task.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "graph/task.h" +#include "mmdeploy/graph/task.h" -#include "core/operator.h" -#include "graph/common.h" +#include "mmdeploy/core/operator.h" +#include "mmdeploy/graph/common.h" namespace mmdeploy::graph { diff --git a/csrc/graph/task.h b/csrc/mmdeploy/graph/task.h similarity index 95% rename from csrc/graph/task.h rename to csrc/mmdeploy/graph/task.h index c17e9acdbe..051d841acd 100644 --- a/csrc/graph/task.h +++ b/csrc/mmdeploy/graph/task.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_CSRC_GRAPH_TASK_H_ #define MMDEPLOY_CSRC_GRAPH_TASK_H_ -#include "core/graph.h" +#include "mmdeploy/core/graph.h" namespace mmdeploy::graph { diff --git a/csrc/graph/unflatten.cpp b/csrc/mmdeploy/graph/unflatten.cpp similarity index 92% rename from csrc/graph/unflatten.cpp rename to csrc/mmdeploy/graph/unflatten.cpp index de4b434370..ee433814c9 100644 --- a/csrc/graph/unflatten.cpp +++ b/csrc/mmdeploy/graph/unflatten.cpp @@ -1,7 +1,7 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "archive/value_archive.h" -#include "core/operator.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/operator.h" #include "pipeline.h" namespace mmdeploy::graph { diff --git a/csrc/model/CMakeLists.txt b/csrc/mmdeploy/model/CMakeLists.txt similarity index 100% rename from csrc/model/CMakeLists.txt rename to csrc/mmdeploy/model/CMakeLists.txt diff --git a/csrc/model/directory_model_impl.cpp b/csrc/mmdeploy/model/directory_model_impl.cpp similarity index 90% rename from csrc/model/directory_model_impl.cpp rename to csrc/mmdeploy/model/directory_model_impl.cpp index 202eafb12f..688c7e68e6 100644 --- a/csrc/model/directory_model_impl.cpp +++ b/csrc/mmdeploy/model/directory_model_impl.cpp @@ -2,10 +2,10 @@ #include -#include "archive/json_archive.h" -#include "core/model.h" -#include "core/model_impl.h" -#include "core/utils/filesystem.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/model_impl.h" +#include "mmdeploy/core/utils/filesystem.h" using nlohmann::json; diff --git a/csrc/model/zip_model_impl.cpp b/csrc/mmdeploy/model/zip_model_impl.cpp similarity index 95% rename from csrc/model/zip_model_impl.cpp rename to csrc/mmdeploy/model/zip_model_impl.cpp index 54545860f8..a05344104f 100644 --- a/csrc/model/zip_model_impl.cpp +++ b/csrc/mmdeploy/model/zip_model_impl.cpp @@ -3,11 +3,11 @@ #include #include -#include "archive/json_archive.h" -#include "core/logger.h" -#include "core/model.h" -#include "core/model_impl.h" -#include "core/utils/filesystem.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/model_impl.h" +#include "mmdeploy/core/utils/filesystem.h" #include "zip.h" using nlohmann::json; diff --git a/csrc/net/CMakeLists.txt b/csrc/mmdeploy/net/CMakeLists.txt similarity index 100% rename from csrc/net/CMakeLists.txt rename to csrc/mmdeploy/net/CMakeLists.txt diff --git a/csrc/net/ncnn/CMakeLists.txt b/csrc/mmdeploy/net/ncnn/CMakeLists.txt similarity index 100% rename from csrc/net/ncnn/CMakeLists.txt rename to csrc/mmdeploy/net/ncnn/CMakeLists.txt diff --git a/csrc/net/ncnn/ncnn_net.cpp b/csrc/mmdeploy/net/ncnn/ncnn_net.cpp similarity index 97% rename from csrc/net/ncnn/ncnn_net.cpp rename to csrc/mmdeploy/net/ncnn/ncnn_net.cpp index d932954810..4140e643dd 100644 --- a/csrc/net/ncnn/ncnn_net.cpp +++ b/csrc/mmdeploy/net/ncnn/ncnn_net.cpp @@ -2,9 +2,9 @@ #include "ncnn_net.h" -#include "core/logger.h" -#include "core/model.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/utils/formatter.h" #include "ncnn_ops_register.h" namespace mmdeploy { diff --git a/csrc/net/ncnn/ncnn_net.h b/csrc/mmdeploy/net/ncnn/ncnn_net.h similarity index 96% rename from csrc/net/ncnn/ncnn_net.h rename to csrc/mmdeploy/net/ncnn/ncnn_net.h index 7cd39f995c..0c4b037d7b 100644 --- a/csrc/net/ncnn/ncnn_net.h +++ b/csrc/mmdeploy/net/ncnn/ncnn_net.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_SRC_NET_NCNN_NCNN_NET_H_ #define MMDEPLOY_SRC_NET_NCNN_NCNN_NET_H_ -#include "core/net.h" +#include "mmdeploy/core/net.h" // It's ncnn's net.h #include "net.h" diff --git a/csrc/net/net_module.cpp b/csrc/mmdeploy/net/net_module.cpp similarity index 95% rename from csrc/net/net_module.cpp rename to csrc/mmdeploy/net/net_module.cpp index 3178aadc12..206b798c9f 100644 --- a/csrc/net/net_module.cpp +++ b/csrc/mmdeploy/net/net_module.cpp @@ -4,15 +4,15 @@ #include -#include "archive/value_archive.h" -#include "core/logger.h" -#include "core/model.h" -#include "core/module.h" -#include "core/net.h" -#include "core/registry.h" -#include "core/utils/formatter.h" -#include "core/utils/scope_counter.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/net.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/utils/scope_counter.h" +#include "mmdeploy/experimental/module_adapter.h" using std::string; using std::vector; diff --git a/csrc/net/net_module.h b/csrc/mmdeploy/net/net_module.h similarity index 81% rename from csrc/net/net_module.h rename to csrc/mmdeploy/net/net_module.h index 84a06ed166..b5401514fc 100644 --- a/csrc/net/net_module.h +++ b/csrc/mmdeploy/net/net_module.h @@ -3,9 +3,9 @@ #ifndef MMDEPLOY_SRC_MODULE_NET_MODULE_H_ #define MMDEPLOY_SRC_MODULE_NET_MODULE_H_ -#include "core/status_code.h" -#include "core/tensor.h" -#include "core/value.h" +#include "mmdeploy/core/status_code.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/value.h" namespace mmdeploy { diff --git a/csrc/net/openvino/CMakeLists.txt b/csrc/mmdeploy/net/openvino/CMakeLists.txt similarity index 100% rename from csrc/net/openvino/CMakeLists.txt rename to csrc/mmdeploy/net/openvino/CMakeLists.txt diff --git a/csrc/net/openvino/openvino_net.cpp b/csrc/mmdeploy/net/openvino/openvino_net.cpp similarity index 98% rename from csrc/net/openvino/openvino_net.cpp rename to csrc/mmdeploy/net/openvino/openvino_net.cpp index 050658f970..50a2b999dd 100644 --- a/csrc/net/openvino/openvino_net.cpp +++ b/csrc/mmdeploy/net/openvino/openvino_net.cpp @@ -5,10 +5,10 @@ #include -#include "core/logger.h" -#include "core/model.h" -#include "core/utils/filesystem.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/utils/filesystem.h" +#include "mmdeploy/core/utils/formatter.h" namespace mmdeploy { diff --git a/csrc/net/openvino/openvino_net.h b/csrc/mmdeploy/net/openvino/openvino_net.h similarity index 97% rename from csrc/net/openvino/openvino_net.h rename to csrc/mmdeploy/net/openvino/openvino_net.h index 08c4ec285f..2cfeee72a7 100644 --- a/csrc/net/openvino/openvino_net.h +++ b/csrc/mmdeploy/net/openvino/openvino_net.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_SRC_NET_OPENVINO_OPENVINO_NET_H_ #define MMDEPLOY_SRC_NET_OPENVINO_OPENVINO_NET_H_ -#include "core/net.h" #include "inference_engine.hpp" +#include "mmdeploy/core/net.h" namespace mmdeploy { diff --git a/csrc/net/ort/CMakeLists.txt b/csrc/mmdeploy/net/ort/CMakeLists.txt similarity index 100% rename from csrc/net/ort/CMakeLists.txt rename to csrc/mmdeploy/net/ort/CMakeLists.txt diff --git a/csrc/net/ort/ort_net.cpp b/csrc/mmdeploy/net/ort/ort_net.cpp similarity index 98% rename from csrc/net/ort/ort_net.cpp rename to csrc/mmdeploy/net/ort/ort_net.cpp index 04b597a092..0ddfd76525 100644 --- a/csrc/net/ort/ort_net.cpp +++ b/csrc/mmdeploy/net/ort/ort_net.cpp @@ -4,9 +4,9 @@ #include -#include "core/logger.h" -#include "core/model.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/utils/formatter.h" #include "onnxruntime_register.h" namespace mmdeploy { diff --git a/csrc/net/ort/ort_net.h b/csrc/mmdeploy/net/ort/ort_net.h similarity index 96% rename from csrc/net/ort/ort_net.h rename to csrc/mmdeploy/net/ort/ort_net.h index 1bad2f6d86..3388f9f204 100644 --- a/csrc/net/ort/ort_net.h +++ b/csrc/mmdeploy/net/ort/ort_net.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_SRC_NET_ORT_ORT_NET_H_ #define MMDEPLOY_SRC_NET_ORT_ORT_NET_H_ -#include "core/net.h" +#include "mmdeploy/core/net.h" #include "onnxruntime_c_api.h" #include "onnxruntime_cxx_api.h" diff --git a/csrc/net/ppl/CMakeLists.txt b/csrc/mmdeploy/net/ppl/CMakeLists.txt similarity index 100% rename from csrc/net/ppl/CMakeLists.txt rename to csrc/mmdeploy/net/ppl/CMakeLists.txt diff --git a/csrc/net/ppl/ppl_net.cpp b/csrc/mmdeploy/net/ppl/ppl_net.cpp similarity index 98% rename from csrc/net/ppl/ppl_net.cpp rename to csrc/mmdeploy/net/ppl/ppl_net.cpp index f0d4b16030..f8cfd990e7 100644 --- a/csrc/net/ppl/ppl_net.cpp +++ b/csrc/mmdeploy/net/ppl/ppl_net.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "ppl_net.h" -#include "archive/value_archive.h" -#include "core/logger.h" -#include "core/model.h" -#include "core/utils/formatter.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/utils/formatter.h" #include "ppl/nn/common/logger.h" #include "ppl/nn/models/onnx/onnx_runtime_builder_factory.h" #if PPL_NN_HAS_X86 diff --git a/csrc/net/ppl/ppl_net.h b/csrc/mmdeploy/net/ppl/ppl_net.h similarity index 96% rename from csrc/net/ppl/ppl_net.h rename to csrc/mmdeploy/net/ppl/ppl_net.h index e424db7ea4..996ddbec9a 100644 --- a/csrc/net/ppl/ppl_net.h +++ b/csrc/mmdeploy/net/ppl/ppl_net.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_SRC_NET_PPL_PPL_NET_H_ #define MMDEPLOY_SRC_NET_PPL_PPL_NET_H_ -#include "core/mpl/span.h" -#include "core/net.h" +#include "mmdeploy/core/mpl/span.h" +#include "mmdeploy/core/net.h" #include "ppl/nn/engines/engine.h" #include "ppl/nn/runtime/runtime.h" diff --git a/csrc/net/trt/CMakeLists.txt b/csrc/mmdeploy/net/trt/CMakeLists.txt similarity index 100% rename from csrc/net/trt/CMakeLists.txt rename to csrc/mmdeploy/net/trt/CMakeLists.txt diff --git a/csrc/net/trt/trt_net.cpp b/csrc/mmdeploy/net/trt/trt_net.cpp similarity index 97% rename from csrc/net/trt/trt_net.cpp rename to csrc/mmdeploy/net/trt/trt_net.cpp index 6caad3ed8f..e70cb83976 100644 --- a/csrc/net/trt/trt_net.cpp +++ b/csrc/mmdeploy/net/trt/trt_net.cpp @@ -4,10 +4,10 @@ #include -#include "core/logger.h" -#include "core/model.h" -#include "core/module.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/utils/formatter.h" namespace mmdeploy { diff --git a/csrc/net/trt/trt_net.h b/csrc/mmdeploy/net/trt/trt_net.h similarity index 96% rename from csrc/net/trt/trt_net.h rename to csrc/mmdeploy/net/trt/trt_net.h index 72be2b5473..71f4bd2c51 100644 --- a/csrc/net/trt/trt_net.h +++ b/csrc/mmdeploy/net/trt/trt_net.h @@ -3,10 +3,9 @@ #ifndef MMDEPLOY_SRC_NET_TRT_TRT_NET_H_ #define MMDEPLOY_SRC_NET_TRT_TRT_NET_H_ -#include - #include "NvInferRuntime.h" -#include "core/net.h" +#include "mmdeploy/core/mpl/span.h" +#include "mmdeploy/core/net.h" namespace mmdeploy { diff --git a/csrc/preprocess/CMakeLists.txt b/csrc/mmdeploy/preprocess/CMakeLists.txt similarity index 100% rename from csrc/preprocess/CMakeLists.txt rename to csrc/mmdeploy/preprocess/CMakeLists.txt diff --git a/csrc/preprocess/cpu/CMakeLists.txt b/csrc/mmdeploy/preprocess/cpu/CMakeLists.txt similarity index 100% rename from csrc/preprocess/cpu/CMakeLists.txt rename to csrc/mmdeploy/preprocess/cpu/CMakeLists.txt diff --git a/csrc/preprocess/cpu/collect_impl.cpp b/csrc/mmdeploy/preprocess/cpu/collect_impl.cpp similarity index 93% rename from csrc/preprocess/cpu/collect_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/collect_impl.cpp index 05df052895..a5eab40724 100644 --- a/csrc/preprocess/cpu/collect_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/collect_impl.cpp @@ -1,6 +1,6 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "preprocess/transform/collect.h" +#include "mmdeploy/preprocess/transform/collect.h" namespace mmdeploy { namespace cpu { diff --git a/csrc/preprocess/cpu/crop_impl.cpp b/csrc/mmdeploy/preprocess/cpu/crop_impl.cpp similarity index 92% rename from csrc/preprocess/cpu/crop_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/crop_impl.cpp index 740b3416ae..1935771ab1 100644 --- a/csrc/preprocess/cpu/crop_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/crop_impl.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/device_utils.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/crop.h" #include "opencv_utils.h" -#include "preprocess/transform/crop.h" using namespace std; diff --git a/csrc/preprocess/cpu/default_format_bundle_impl.cpp b/csrc/mmdeploy/preprocess/cpu/default_format_bundle_impl.cpp similarity index 94% rename from csrc/preprocess/cpu/default_format_bundle_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/default_format_bundle_impl.cpp index 37b62617ae..cdb7f75c17 100644 --- a/csrc/preprocess/cpu/default_format_bundle_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/default_format_bundle_impl.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/device_utils.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/default_format_bundle.h" #include "opencv_utils.h" -#include "preprocess/transform/default_format_bundle.h" namespace mmdeploy { namespace cpu { diff --git a/csrc/preprocess/cpu/image2tensor_impl.cpp b/csrc/mmdeploy/preprocess/cpu/image2tensor_impl.cpp similarity index 92% rename from csrc/preprocess/cpu/image2tensor_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/image2tensor_impl.cpp index 3e497f56d7..1f6a45897a 100644 --- a/csrc/preprocess/cpu/image2tensor_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/image2tensor_impl.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/device_utils.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/image2tensor.h" #include "opencv_utils.h" -#include "preprocess/transform/image2tensor.h" namespace mmdeploy { namespace cpu { diff --git a/csrc/preprocess/cpu/load_impl.cpp b/csrc/mmdeploy/preprocess/cpu/load_impl.cpp similarity index 97% rename from csrc/preprocess/cpu/load_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/load_impl.cpp index 9583aa4623..ce857eced4 100644 --- a/csrc/preprocess/cpu/load_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/load_impl.cpp @@ -1,7 +1,7 @@ // Copyright (c) OpenMMLab. All rights reserved. +#include "mmdeploy/preprocess/transform/load.h" #include "opencv_utils.h" -#include "preprocess/transform/load.h" using namespace std; diff --git a/csrc/preprocess/cpu/normalize_impl.cpp b/csrc/mmdeploy/preprocess/cpu/normalize_impl.cpp similarity index 89% rename from csrc/preprocess/cpu/normalize_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/normalize_impl.cpp index 3e56c111a8..ebf5f9b233 100644 --- a/csrc/preprocess/cpu/normalize_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/normalize_impl.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/registry.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/normalize.h" #include "opencv_utils.h" -#include "preprocess/transform/normalize.h" using namespace std; diff --git a/csrc/preprocess/cpu/pad_impl.cpp b/csrc/mmdeploy/preprocess/cpu/pad_impl.cpp similarity index 94% rename from csrc/preprocess/cpu/pad_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/pad_impl.cpp index 5bf2ce9cc3..0254def189 100644 --- a/csrc/preprocess/cpu/pad_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/pad_impl.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/device_utils.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/pad.h" #include "opencv_utils.h" -#include "preprocess/transform/pad.h" using namespace std; diff --git a/csrc/preprocess/cpu/resize_impl.cpp b/csrc/mmdeploy/preprocess/cpu/resize_impl.cpp similarity index 87% rename from csrc/preprocess/cpu/resize_impl.cpp rename to csrc/mmdeploy/preprocess/cpu/resize_impl.cpp index 9e03e5b792..e44fc5188a 100644 --- a/csrc/preprocess/cpu/resize_impl.cpp +++ b/csrc/mmdeploy/preprocess/cpu/resize_impl.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/registry.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/resize.h" #include "opencv_utils.h" -#include "preprocess/transform/resize.h" using namespace std; diff --git a/csrc/preprocess/cuda/CMakeLists.txt b/csrc/mmdeploy/preprocess/cuda/CMakeLists.txt similarity index 100% rename from csrc/preprocess/cuda/CMakeLists.txt rename to csrc/mmdeploy/preprocess/cuda/CMakeLists.txt diff --git a/csrc/preprocess/cuda/cast.cu b/csrc/mmdeploy/preprocess/cuda/cast.cu similarity index 100% rename from csrc/preprocess/cuda/cast.cu rename to csrc/mmdeploy/preprocess/cuda/cast.cu diff --git a/csrc/preprocess/cuda/crop.cu b/csrc/mmdeploy/preprocess/cuda/crop.cu similarity index 100% rename from csrc/preprocess/cuda/crop.cu rename to csrc/mmdeploy/preprocess/cuda/crop.cu diff --git a/csrc/preprocess/cuda/crop_impl.cpp b/csrc/mmdeploy/preprocess/cuda/crop_impl.cpp similarity index 96% rename from csrc/preprocess/cuda/crop_impl.cpp rename to csrc/mmdeploy/preprocess/cuda/crop_impl.cpp index e33a3e3c69..ec207d85a6 100644 --- a/csrc/preprocess/cuda/crop_impl.cpp +++ b/csrc/mmdeploy/preprocess/cuda/crop_impl.cpp @@ -2,8 +2,8 @@ #include -#include "core/utils/device_utils.h" -#include "preprocess/transform/crop.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/crop.h" using namespace std; diff --git a/csrc/preprocess/cuda/default_format_bundle_impl.cpp b/csrc/mmdeploy/preprocess/cuda/default_format_bundle_impl.cpp similarity index 96% rename from csrc/preprocess/cuda/default_format_bundle_impl.cpp rename to csrc/mmdeploy/preprocess/cuda/default_format_bundle_impl.cpp index 0cc143a2ad..848dab921d 100644 --- a/csrc/preprocess/cuda/default_format_bundle_impl.cpp +++ b/csrc/mmdeploy/preprocess/cuda/default_format_bundle_impl.cpp @@ -2,8 +2,8 @@ #include -#include "core/utils/device_utils.h" -#include "preprocess/transform/default_format_bundle.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/default_format_bundle.h" namespace mmdeploy { namespace cuda { diff --git a/csrc/preprocess/cuda/image2tensor_impl.cpp b/csrc/mmdeploy/preprocess/cuda/image2tensor_impl.cpp similarity index 94% rename from csrc/preprocess/cuda/image2tensor_impl.cpp rename to csrc/mmdeploy/preprocess/cuda/image2tensor_impl.cpp index 28876a2254..60bd44ba3a 100644 --- a/csrc/preprocess/cuda/image2tensor_impl.cpp +++ b/csrc/mmdeploy/preprocess/cuda/image2tensor_impl.cpp @@ -2,8 +2,8 @@ #include -#include "core/utils/device_utils.h" -#include "preprocess/transform/image2tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/image2tensor.h" namespace mmdeploy { namespace cuda { diff --git a/csrc/preprocess/cuda/load_impl.cpp b/csrc/mmdeploy/preprocess/cuda/load_impl.cpp similarity index 97% rename from csrc/preprocess/cuda/load_impl.cpp rename to csrc/mmdeploy/preprocess/cuda/load_impl.cpp index cec80b401c..b4f0f09397 100644 --- a/csrc/preprocess/cuda/load_impl.cpp +++ b/csrc/mmdeploy/preprocess/cuda/load_impl.cpp @@ -2,10 +2,10 @@ #include -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/load.h" #include "ppl/cv/cuda/cvtcolor.h" -#include "preprocess/transform/load.h" using namespace std; using namespace ppl::cv::cuda; diff --git a/csrc/preprocess/cuda/normalize.cu b/csrc/mmdeploy/preprocess/cuda/normalize.cu similarity index 100% rename from csrc/preprocess/cuda/normalize.cu rename to csrc/mmdeploy/preprocess/cuda/normalize.cu diff --git a/csrc/preprocess/cuda/normalize_impl.cpp b/csrc/mmdeploy/preprocess/cuda/normalize_impl.cpp similarity index 95% rename from csrc/preprocess/cuda/normalize_impl.cpp rename to csrc/mmdeploy/preprocess/cuda/normalize_impl.cpp index c337305670..d8e96ef2b1 100644 --- a/csrc/preprocess/cuda/normalize_impl.cpp +++ b/csrc/mmdeploy/preprocess/cuda/normalize_impl.cpp @@ -2,9 +2,9 @@ #include -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" -#include "preprocess/transform/normalize.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/normalize.h" using namespace std; diff --git a/csrc/preprocess/cuda/pad_impl.cpp b/csrc/mmdeploy/preprocess/cuda/pad_impl.cpp similarity index 97% rename from csrc/preprocess/cuda/pad_impl.cpp rename to csrc/mmdeploy/preprocess/cuda/pad_impl.cpp index 511b95b2f3..ff6bc63e26 100644 --- a/csrc/preprocess/cuda/pad_impl.cpp +++ b/csrc/mmdeploy/preprocess/cuda/pad_impl.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/pad.h" #include "ppl/cv/cuda/copymakeborder.h" -#include "preprocess/transform/pad.h" using namespace std; using namespace ppl::cv::cuda; diff --git a/csrc/preprocess/cuda/resize_impl.cpp b/csrc/mmdeploy/preprocess/cuda/resize_impl.cpp similarity index 96% rename from csrc/preprocess/cuda/resize_impl.cpp rename to csrc/mmdeploy/preprocess/cuda/resize_impl.cpp index 2c6d07c0d6..5b1b61a678 100644 --- a/csrc/preprocess/cuda/resize_impl.cpp +++ b/csrc/mmdeploy/preprocess/cuda/resize_impl.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. -#include "core/utils/device_utils.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/preprocess/transform/resize.h" #include "ppl/cv/cuda/resize.h" -#include "preprocess/transform/resize.h" using namespace std; diff --git a/csrc/preprocess/cuda/transpose.cu b/csrc/mmdeploy/preprocess/cuda/transpose.cu similarity index 100% rename from csrc/preprocess/cuda/transpose.cu rename to csrc/mmdeploy/preprocess/cuda/transpose.cu diff --git a/csrc/preprocess/transform/CMakeLists.txt b/csrc/mmdeploy/preprocess/transform/CMakeLists.txt similarity index 100% rename from csrc/preprocess/transform/CMakeLists.txt rename to csrc/mmdeploy/preprocess/transform/CMakeLists.txt diff --git a/csrc/preprocess/transform/collect.cpp b/csrc/mmdeploy/preprocess/transform/collect.cpp similarity index 96% rename from csrc/preprocess/transform/collect.cpp rename to csrc/mmdeploy/preprocess/transform/collect.cpp index d01d1cf4b3..119415cd70 100644 --- a/csrc/preprocess/transform/collect.cpp +++ b/csrc/mmdeploy/preprocess/transform/collect.cpp @@ -2,8 +2,8 @@ #include "collect.h" -#include "archive/json_archive.h" -#include "core/logger.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/logger.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/collect.h b/csrc/mmdeploy/preprocess/transform/collect.h similarity index 100% rename from csrc/preprocess/transform/collect.h rename to csrc/mmdeploy/preprocess/transform/collect.h diff --git a/csrc/preprocess/transform/compose.cpp b/csrc/mmdeploy/preprocess/transform/compose.cpp similarity index 93% rename from csrc/preprocess/transform/compose.cpp rename to csrc/mmdeploy/preprocess/transform/compose.cpp index be147e20d1..a6d9da2f68 100644 --- a/csrc/preprocess/transform/compose.cpp +++ b/csrc/mmdeploy/preprocess/transform/compose.cpp @@ -2,9 +2,9 @@ #include "compose.h" -#include "archive/json_archive.h" -#include "archive/value_archive.h" -#include "core/utils/formatter.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/utils/formatter.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/compose.h b/csrc/mmdeploy/preprocess/transform/compose.h similarity index 100% rename from csrc/preprocess/transform/compose.h rename to csrc/mmdeploy/preprocess/transform/compose.h diff --git a/csrc/preprocess/transform/crop.cpp b/csrc/mmdeploy/preprocess/transform/crop.cpp similarity index 98% rename from csrc/preprocess/transform/crop.cpp rename to csrc/mmdeploy/preprocess/transform/crop.cpp index 39badbb05b..2d61ad9bad 100644 --- a/csrc/preprocess/transform/crop.cpp +++ b/csrc/mmdeploy/preprocess/transform/crop.cpp @@ -2,7 +2,7 @@ #include "crop.h" -#include "archive/json_archive.h" +#include "mmdeploy/archive/json_archive.h" using namespace std; diff --git a/csrc/preprocess/transform/crop.h b/csrc/mmdeploy/preprocess/transform/crop.h similarity index 96% rename from csrc/preprocess/transform/crop.h rename to csrc/mmdeploy/preprocess/transform/crop.h index 1f96b19b21..1829860641 100644 --- a/csrc/preprocess/transform/crop.h +++ b/csrc/mmdeploy/preprocess/transform/crop.h @@ -5,7 +5,7 @@ #include -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/default_format_bundle.cpp b/csrc/mmdeploy/preprocess/transform/default_format_bundle.cpp similarity index 96% rename from csrc/preprocess/transform/default_format_bundle.cpp rename to csrc/mmdeploy/preprocess/transform/default_format_bundle.cpp index abe6b01dd4..6ecc60fd3c 100644 --- a/csrc/preprocess/transform/default_format_bundle.cpp +++ b/csrc/mmdeploy/preprocess/transform/default_format_bundle.cpp @@ -4,8 +4,8 @@ #include -#include "archive/json_archive.h" -#include "core/tensor.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/tensor.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/default_format_bundle.h b/csrc/mmdeploy/preprocess/transform/default_format_bundle.h similarity index 97% rename from csrc/preprocess/transform/default_format_bundle.h rename to csrc/mmdeploy/preprocess/transform/default_format_bundle.h index 708b737f1b..f43c373749 100644 --- a/csrc/preprocess/transform/default_format_bundle.h +++ b/csrc/mmdeploy/preprocess/transform/default_format_bundle.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_DEFAULT_FORMAT_BUNDLE_H #define MMDEPLOY_DEFAULT_FORMAT_BUNDLE_H -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/image2tensor.cpp b/csrc/mmdeploy/preprocess/transform/image2tensor.cpp similarity index 95% rename from csrc/preprocess/transform/image2tensor.cpp rename to csrc/mmdeploy/preprocess/transform/image2tensor.cpp index 163a73a2f4..12286dadf9 100644 --- a/csrc/preprocess/transform/image2tensor.cpp +++ b/csrc/mmdeploy/preprocess/transform/image2tensor.cpp @@ -4,8 +4,8 @@ #include -#include "archive/json_archive.h" -#include "core/tensor.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/tensor.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/image2tensor.h b/csrc/mmdeploy/preprocess/transform/image2tensor.h similarity index 97% rename from csrc/preprocess/transform/image2tensor.h rename to csrc/mmdeploy/preprocess/transform/image2tensor.h index 67acb2c67d..bc98918002 100644 --- a/csrc/preprocess/transform/image2tensor.h +++ b/csrc/mmdeploy/preprocess/transform/image2tensor.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_IMAGE2TENSOR_H #define MMDEPLOY_IMAGE2TENSOR_H -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/load.cpp b/csrc/mmdeploy/preprocess/transform/load.cpp similarity index 98% rename from csrc/preprocess/transform/load.cpp rename to csrc/mmdeploy/preprocess/transform/load.cpp index 2d9a647975..a730907b8d 100644 --- a/csrc/preprocess/transform/load.cpp +++ b/csrc/mmdeploy/preprocess/transform/load.cpp @@ -2,7 +2,7 @@ #include "load.h" -#include "archive/json_archive.h" +#include "mmdeploy/archive/json_archive.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/load.h b/csrc/mmdeploy/preprocess/transform/load.h similarity index 94% rename from csrc/preprocess/transform/load.h rename to csrc/mmdeploy/preprocess/transform/load.h index 66f53d8f30..985170d1e6 100644 --- a/csrc/preprocess/transform/load.h +++ b/csrc/mmdeploy/preprocess/transform/load.h @@ -3,8 +3,8 @@ #ifndef MMDEPLOY_LOAD_H #define MMDEPLOY_LOAD_H -#include "core/mat.h" -#include "core/tensor.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/tensor.h" #include "transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/normalize.cpp b/csrc/mmdeploy/preprocess/transform/normalize.cpp similarity index 96% rename from csrc/preprocess/transform/normalize.cpp rename to csrc/mmdeploy/preprocess/transform/normalize.cpp index 7318a8ac31..4f84543542 100644 --- a/csrc/preprocess/transform/normalize.cpp +++ b/csrc/mmdeploy/preprocess/transform/normalize.cpp @@ -2,9 +2,9 @@ #include "normalize.h" -#include "archive/json_archive.h" -#include "core/registry.h" -#include "core/tensor.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/tensor.h" using namespace std; diff --git a/csrc/preprocess/transform/normalize.h b/csrc/mmdeploy/preprocess/transform/normalize.h similarity index 96% rename from csrc/preprocess/transform/normalize.h rename to csrc/mmdeploy/preprocess/transform/normalize.h index f06adddafd..e2d3f2a84c 100644 --- a/csrc/preprocess/transform/normalize.h +++ b/csrc/mmdeploy/preprocess/transform/normalize.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_NORMALIZE_H #define MMDEPLOY_NORMALIZE_H -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/pad.cpp b/csrc/mmdeploy/preprocess/transform/pad.cpp similarity index 98% rename from csrc/preprocess/transform/pad.cpp rename to csrc/mmdeploy/preprocess/transform/pad.cpp index 293348347a..c5cb85d58f 100644 --- a/csrc/preprocess/transform/pad.cpp +++ b/csrc/mmdeploy/preprocess/transform/pad.cpp @@ -2,7 +2,7 @@ #include "pad.h" -#include "archive/json_archive.h" +#include "mmdeploy/archive/json_archive.h" using namespace std; diff --git a/csrc/preprocess/transform/pad.h b/csrc/mmdeploy/preprocess/transform/pad.h similarity index 97% rename from csrc/preprocess/transform/pad.h rename to csrc/mmdeploy/preprocess/transform/pad.h index 1b5ccbcd5f..92246f9401 100644 --- a/csrc/preprocess/transform/pad.h +++ b/csrc/mmdeploy/preprocess/transform/pad.h @@ -5,7 +5,7 @@ #include -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/resize.cpp b/csrc/mmdeploy/preprocess/transform/resize.cpp similarity index 98% rename from csrc/preprocess/transform/resize.cpp rename to csrc/mmdeploy/preprocess/transform/resize.cpp index f576cacc93..1d2bbe9dec 100644 --- a/csrc/preprocess/transform/resize.cpp +++ b/csrc/mmdeploy/preprocess/transform/resize.cpp @@ -4,8 +4,8 @@ #include -#include "archive/json_archive.h" -#include "core/tensor.h" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/tensor.h" using namespace std; diff --git a/csrc/preprocess/transform/resize.h b/csrc/mmdeploy/preprocess/transform/resize.h similarity index 96% rename from csrc/preprocess/transform/resize.h rename to csrc/mmdeploy/preprocess/transform/resize.h index 54947bee48..bd562f0e20 100644 --- a/csrc/preprocess/transform/resize.h +++ b/csrc/mmdeploy/preprocess/transform/resize.h @@ -5,7 +5,7 @@ #include -#include "core/tensor.h" +#include "mmdeploy/core/tensor.h" #include "transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/transform.cpp b/csrc/mmdeploy/preprocess/transform/transform.cpp similarity index 94% rename from csrc/preprocess/transform/transform.cpp rename to csrc/mmdeploy/preprocess/transform/transform.cpp index f2be7519c4..20cc1c9f86 100644 --- a/csrc/preprocess/transform/transform.cpp +++ b/csrc/mmdeploy/preprocess/transform/transform.cpp @@ -2,8 +2,8 @@ #include "transform.h" -#include "core/registry.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/formatter.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform/transform.h b/csrc/mmdeploy/preprocess/transform/transform.h similarity index 95% rename from csrc/preprocess/transform/transform.h rename to csrc/mmdeploy/preprocess/transform/transform.h index 64456d41e3..f4fdc89536 100644 --- a/csrc/preprocess/transform/transform.h +++ b/csrc/mmdeploy/preprocess/transform/transform.h @@ -3,9 +3,9 @@ #ifndef MMDEPLOY_TRANSFORM_H #define MMDEPLOY_TRANSFORM_H -#include "core/device.h" -#include "core/module.h" -#include "core/registry.h" +#include "mmdeploy/core/device.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/registry.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform_module.cpp b/csrc/mmdeploy/preprocess/transform_module.cpp similarity index 88% rename from csrc/preprocess/transform_module.cpp rename to csrc/mmdeploy/preprocess/transform_module.cpp index 3659549ea4..e843dd78d6 100644 --- a/csrc/preprocess/transform_module.cpp +++ b/csrc/mmdeploy/preprocess/transform_module.cpp @@ -2,11 +2,11 @@ #include "transform_module.h" -#include "archive/value_archive.h" -#include "core/module.h" -#include "core/utils/formatter.h" -#include "experimental/module_adapter.h" -#include "preprocess/transform/transform.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/experimental/module_adapter.h" +#include "mmdeploy/preprocess/transform/transform.h" namespace mmdeploy { diff --git a/csrc/preprocess/transform_module.h b/csrc/mmdeploy/preprocess/transform_module.h similarity index 94% rename from csrc/preprocess/transform_module.h rename to csrc/mmdeploy/preprocess/transform_module.h index d7844566fb..24f0a1ad07 100644 --- a/csrc/preprocess/transform_module.h +++ b/csrc/mmdeploy/preprocess/transform_module.h @@ -3,7 +3,7 @@ #ifndef MMDEPLOY_SRC_MODULE_TRANSFORM_MODULE_H_ #define MMDEPLOY_SRC_MODULE_TRANSFORM_MODULE_H_ -#include "core/value.h" +#include "mmdeploy/core/value.h" namespace mmdeploy { diff --git a/csrc/utils/CMakeLists.txt b/csrc/mmdeploy/utils/CMakeLists.txt similarity index 100% rename from csrc/utils/CMakeLists.txt rename to csrc/mmdeploy/utils/CMakeLists.txt diff --git a/csrc/utils/opencv/CMakeLists.txt b/csrc/mmdeploy/utils/opencv/CMakeLists.txt similarity index 100% rename from csrc/utils/opencv/CMakeLists.txt rename to csrc/mmdeploy/utils/opencv/CMakeLists.txt diff --git a/csrc/utils/opencv/opencv_utils.cpp b/csrc/mmdeploy/utils/opencv/opencv_utils.cpp similarity index 99% rename from csrc/utils/opencv/opencv_utils.cpp rename to csrc/mmdeploy/utils/opencv/opencv_utils.cpp index ef05dbf2eb..f04086b5d2 100644 --- a/csrc/utils/opencv/opencv_utils.cpp +++ b/csrc/mmdeploy/utils/opencv/opencv_utils.cpp @@ -4,8 +4,8 @@ #include -#include "core/logger.h" -#include "core/utils/formatter.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/utils/formatter.h" namespace mmdeploy { namespace cpu { diff --git a/csrc/utils/opencv/opencv_utils.h b/csrc/mmdeploy/utils/opencv/opencv_utils.h similarity index 96% rename from csrc/utils/opencv/opencv_utils.h rename to csrc/mmdeploy/utils/opencv/opencv_utils.h index 05f8405eb4..ebd398ce7c 100644 --- a/csrc/utils/opencv/opencv_utils.h +++ b/csrc/mmdeploy/utils/opencv/opencv_utils.h @@ -3,10 +3,10 @@ #ifndef MMDEPLOY_CSRC_UTILS_OPENCV_OPENCV_UTILS_H_ #define MMDEPLOY_CSRC_UTILS_OPENCV_OPENCV_UTILS_H_ -#include "core/mat.h" -#include "core/mpl/type_traits.h" -#include "core/serialization.h" -#include "core/tensor.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/mpl/type_traits.h" +#include "mmdeploy/core/serialization.h" +#include "mmdeploy/core/tensor.h" #include "opencv2/opencv.hpp" namespace mmdeploy { diff --git a/tests/test_csrc/archive/test_json_archive.cpp b/tests/test_csrc/archive/test_json_archive.cpp index 52c0dc2a7d..ce4aef9994 100644 --- a/tests/test_csrc/archive/test_json_archive.cpp +++ b/tests/test_csrc/archive/test_json_archive.cpp @@ -9,8 +9,8 @@ #include #include -#include "archive/json_archive.h" #include "catch.hpp" +#include "mmdeploy/archive/json_archive.h" using ArrayLikeTypes = std::tuple, std::deque, std::array, std::list, std::set, std::unordered_set, diff --git a/tests/test_csrc/archive/test_value_archive.cpp b/tests/test_csrc/archive/test_value_archive.cpp index f46316e355..ceb53bd764 100644 --- a/tests/test_csrc/archive/test_value_archive.cpp +++ b/tests/test_csrc/archive/test_value_archive.cpp @@ -16,8 +16,8 @@ #include #include -#include "archive/value_archive.h" -#include "core/utils/formatter.h" +#include "mmdeploy/archive/value_archive.h" +#include "mmdeploy/core/utils/formatter.h" // clang-format off diff --git a/tests/test_csrc/capi/test_classifier.cpp b/tests/test_csrc/capi/test_classifier.cpp index 1b4ff1bbf0..a490bd2240 100644 --- a/tests/test_csrc/capi/test_classifier.cpp +++ b/tests/test_csrc/capi/test_classifier.cpp @@ -4,8 +4,8 @@ #include "catch.hpp" // clang-format on -#include "apis/c/classifier.h" -#include "core/logger.h" +#include "mmdeploy/apis/c/classifier.h" +#include "mmdeploy/core/logger.h" #include "opencv2/opencv.hpp" #include "test_resource.h" diff --git a/tests/test_csrc/capi/test_detector.cpp b/tests/test_csrc/capi/test_detector.cpp index 2533418850..ae3b8aa460 100644 --- a/tests/test_csrc/capi/test_detector.cpp +++ b/tests/test_csrc/capi/test_detector.cpp @@ -4,9 +4,9 @@ #include "catch.hpp" // clang-format on -#include "apis/c/detector.h" -#include "core/logger.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/detector.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/utils/formatter.h" #include "opencv2/opencv.hpp" #include "test_resource.h" using namespace std; diff --git a/tests/test_csrc/capi/test_model.cpp b/tests/test_csrc/capi/test_model.cpp index d9bab881f3..34d952580b 100644 --- a/tests/test_csrc/capi/test_model.cpp +++ b/tests/test_csrc/capi/test_model.cpp @@ -4,7 +4,7 @@ #include "catch.hpp" // clang-format on -#include "apis/c/model.h" +#include "mmdeploy/apis/c/model.h" #include "test_resource.h" TEST_CASE("test model c capi", "[model]") { diff --git a/tests/test_csrc/capi/test_restorer.cpp b/tests/test_csrc/capi/test_restorer.cpp index 4e56537174..04670c1c68 100644 --- a/tests/test_csrc/capi/test_restorer.cpp +++ b/tests/test_csrc/capi/test_restorer.cpp @@ -4,7 +4,7 @@ #include "catch.hpp" // clang-format on -#include "apis/c/restorer.h" +#include "mmdeploy/apis/c/restorer.h" #include "opencv2/opencv.hpp" #include "test_resource.h" diff --git a/tests/test_csrc/capi/test_segmentor.cpp b/tests/test_csrc/capi/test_segmentor.cpp index 6de6150bf1..cfaaf4a4f1 100644 --- a/tests/test_csrc/capi/test_segmentor.cpp +++ b/tests/test_csrc/capi/test_segmentor.cpp @@ -4,7 +4,7 @@ #include "catch.hpp" // clang-format on -#include "apis/c/segmentor.h" +#include "mmdeploy/apis/c/segmentor.h" #include "opencv2/opencv.hpp" #include "test_resource.h" diff --git a/tests/test_csrc/capi/test_text_detector.cpp b/tests/test_csrc/capi/test_text_detector.cpp index af12d14e09..a53995432d 100644 --- a/tests/test_csrc/capi/test_text_detector.cpp +++ b/tests/test_csrc/capi/test_text_detector.cpp @@ -3,8 +3,8 @@ #include "catch.hpp" // clang-format on -#include "apis/c/text_detector.h" -#include "core/logger.h" +#include "mmdeploy/apis/c/text_detector.h" +#include "mmdeploy/core/logger.h" #include "opencv2/opencv.hpp" #include "test_resource.h" diff --git a/tests/test_csrc/capi/test_text_recognizer.cpp b/tests/test_csrc/capi/test_text_recognizer.cpp index 3265c4b0ec..98d07189e3 100644 --- a/tests/test_csrc/capi/test_text_recognizer.cpp +++ b/tests/test_csrc/capi/test_text_recognizer.cpp @@ -4,9 +4,9 @@ #include "catch.hpp" // clang-format on -#include "apis/c/text_recognizer.h" -#include "core/logger.h" -#include "core/utils/formatter.h" +#include "mmdeploy/apis/c/text_recognizer.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/utils/formatter.h" #include "opencv2/opencv.hpp" #include "test_resource.h" diff --git a/tests/test_csrc/core/test_execution.cpp b/tests/test_csrc/core/test_execution.cpp index 3796c40f77..979f062257 100644 --- a/tests/test_csrc/core/test_execution.cpp +++ b/tests/test_csrc/core/test_execution.cpp @@ -3,19 +3,19 @@ #include #include -#include "apis/c/executor.h" #include "catch.hpp" -#include "core/utils/formatter.h" -#include "core/value.h" -#include "execution/expand.h" -#include "execution/schedulers/dynamic_batch_scheduler.h" -#include "execution/schedulers/inlined_scheduler.h" -#include "execution/schedulers/registry.h" -#include "execution/schedulers/single_thread_context.h" -#include "execution/schedulers/static_thread_pool.h" -#include "execution/schedulers/timed_single_thread_context.h" -#include "execution/type_erased.h" -#include "execution/when_all_value.h" +#include "mmdeploy/apis/c/executor.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/execution/expand.h" +#include "mmdeploy/execution/schedulers/dynamic_batch_scheduler.h" +#include "mmdeploy/execution/schedulers/inlined_scheduler.h" +#include "mmdeploy/execution/schedulers/registry.h" +#include "mmdeploy/execution/schedulers/single_thread_context.h" +#include "mmdeploy/execution/schedulers/static_thread_pool.h" +#include "mmdeploy/execution/schedulers/timed_single_thread_context.h" +#include "mmdeploy/execution/type_erased.h" +#include "mmdeploy/execution/when_all_value.h" using namespace mmdeploy; diff --git a/tests/test_csrc/core/test_mat.cpp b/tests/test_csrc/core/test_mat.cpp index bb3e1a8842..11627e0392 100644 --- a/tests/test_csrc/core/test_mat.cpp +++ b/tests/test_csrc/core/test_mat.cpp @@ -5,8 +5,8 @@ #include #include "catch.hpp" -#include "core/logger.h" -#include "core/mat.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/mat.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/core/test_module_adapter.cpp b/tests/test_csrc/core/test_module_adapter.cpp index ba5ee085e4..7529ea6ad6 100644 --- a/tests/test_csrc/core/test_module_adapter.cpp +++ b/tests/test_csrc/core/test_module_adapter.cpp @@ -4,8 +4,8 @@ #include "catch.hpp" // clang-format on -#include "core/utils/formatter.h" -#include "experimental/module_adapter.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/experimental/module_adapter.h" namespace test_module_adapter { diff --git a/tests/test_csrc/core/test_registry.cpp b/tests/test_csrc/core/test_registry.cpp index 68815e6e8b..9d1cc49821 100644 --- a/tests/test_csrc/core/test_registry.cpp +++ b/tests/test_csrc/core/test_registry.cpp @@ -3,8 +3,8 @@ #include #include "catch.hpp" -#include "core/module.h" -#include "core/registry.h" +#include "mmdeploy/core/module.h" +#include "mmdeploy/core/registry.h" using namespace mmdeploy; diff --git a/tests/test_csrc/core/test_span.cpp b/tests/test_csrc/core/test_span.cpp index 2043f8a01f..43e33bf658 100644 --- a/tests/test_csrc/core/test_span.cpp +++ b/tests/test_csrc/core/test_span.cpp @@ -4,7 +4,7 @@ #include #include "catch.hpp" -#include "core/mpl/span.h" +#include "mmdeploy/core/mpl/span.h" using mmdeploy::Span; diff --git a/tests/test_csrc/core/test_status_code.cpp b/tests/test_csrc/core/test_status_code.cpp index 1316a07952..d1c14f20a8 100644 --- a/tests/test_csrc/core/test_status_code.cpp +++ b/tests/test_csrc/core/test_status_code.cpp @@ -3,8 +3,8 @@ #include #include "catch.hpp" -#include "core/logger.h" -#include "core/status_code.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/status_code.h" namespace mmdeploy { diff --git a/tests/test_csrc/core/test_value.cpp b/tests/test_csrc/core/test_value.cpp index c69b5cccc2..dd543875c2 100644 --- a/tests/test_csrc/core/test_value.cpp +++ b/tests/test_csrc/core/test_value.cpp @@ -1,12 +1,12 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/logger.h" -#include "core/operator.h" -#include "core/serialization.h" -#include "core/utils/formatter.h" -#include "core/value.h" #include "json.hpp" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/operator.h" +#include "mmdeploy/core/serialization.h" +#include "mmdeploy/core/utils/formatter.h" +#include "mmdeploy/core/value.h" using namespace mmdeploy; @@ -351,7 +351,7 @@ TEST_CASE("test ctor of value", "[value]") { } // -//TEST_CASE("test logger", "[logger]") { +// TEST_CASE("test logger", "[logger]") { // MMDEPLOY_INFO("{}", DataType::kFLOAT); // MMDEPLOY_INFO("{}", DataType::kHALF); // MMDEPLOY_INFO("{}", DataType::kINT8); diff --git a/tests/test_csrc/device/test_cpu_device.cpp b/tests/test_csrc/device/test_cpu_device.cpp index 3109f6cd4b..cbec6012b9 100644 --- a/tests/test_csrc/device/test_cpu_device.cpp +++ b/tests/test_csrc/device/test_cpu_device.cpp @@ -5,7 +5,7 @@ #include #include "catch.hpp" -#include "core/device.h" +#include "mmdeploy/core/device.h" using namespace mmdeploy; using namespace std::string_literals; diff --git a/tests/test_csrc/device/test_cuda_device.cpp b/tests/test_csrc/device/test_cuda_device.cpp index 682976e8ce..8c7f788f50 100644 --- a/tests/test_csrc/device/test_cuda_device.cpp +++ b/tests/test_csrc/device/test_cuda_device.cpp @@ -5,7 +5,7 @@ #include #include "catch.hpp" -#include "core/device.h" +#include "mmdeploy/core/device.h" using namespace mmdeploy; using namespace std::string_literals; diff --git a/tests/test_csrc/device/test_opencl_device.cpp b/tests/test_csrc/device/test_opencl_device.cpp index 952c91ccac..0d92cda413 100644 --- a/tests/test_csrc/device/test_opencl_device.cpp +++ b/tests/test_csrc/device/test_opencl_device.cpp @@ -5,7 +5,7 @@ #include #include "catch.hpp" -#include "core/device.h" +#include "mmdeploy/core/device.h" using namespace mmdeploy; using namespace std::string_literals; diff --git a/tests/test_csrc/model/test_directory_model.cpp b/tests/test_csrc/model/test_directory_model.cpp index 50091383ae..aa96836a31 100644 --- a/tests/test_csrc/model/test_directory_model.cpp +++ b/tests/test_csrc/model/test_directory_model.cpp @@ -3,8 +3,8 @@ // clang-format off #include "catch.hpp" // clang-format on -#include "core/model.h" -#include "core/model_impl.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/model_impl.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/model/test_model.cpp b/tests/test_csrc/model/test_model.cpp index 34bd4c9841..eb0f489318 100644 --- a/tests/test_csrc/model/test_model.cpp +++ b/tests/test_csrc/model/test_model.cpp @@ -3,9 +3,9 @@ // clang-format off #include "catch.hpp" // clang-format on -#include "core/logger.h" -#include "core/model.h" -#include "core/model_impl.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/model_impl.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/model/test_zip_model.cpp b/tests/test_csrc/model/test_zip_model.cpp index 8d5cb9ca76..b92e50c302 100644 --- a/tests/test_csrc/model/test_zip_model.cpp +++ b/tests/test_csrc/model/test_zip_model.cpp @@ -5,9 +5,9 @@ // clang-format on #include -#include "core/logger.h" -#include "core/model.h" -#include "core/model_impl.h" +#include "mmdeploy/core/logger.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/model_impl.h" #include "test_resource.h" using namespace std; diff --git a/tests/test_csrc/net/test_ncnn_net.cpp b/tests/test_csrc/net/test_ncnn_net.cpp index b55280c041..ea04b43cd8 100644 --- a/tests/test_csrc/net/test_ncnn_net.cpp +++ b/tests/test_csrc/net/test_ncnn_net.cpp @@ -4,8 +4,8 @@ #include "catch.hpp" // clang-format on -#include "core/model.h" -#include "core/net.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/net.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/net/test_openvino_net.cpp b/tests/test_csrc/net/test_openvino_net.cpp index c3f82eb61e..df5c1be03a 100644 --- a/tests/test_csrc/net/test_openvino_net.cpp +++ b/tests/test_csrc/net/test_openvino_net.cpp @@ -4,8 +4,8 @@ #include "catch.hpp" // clang-format on -#include "core/model.h" -#include "core/net.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/net.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/net/test_ort_net.cpp b/tests/test_csrc/net/test_ort_net.cpp index 1162210009..801ecf9e57 100644 --- a/tests/test_csrc/net/test_ort_net.cpp +++ b/tests/test_csrc/net/test_ort_net.cpp @@ -4,8 +4,8 @@ #include "catch.hpp" // clang-format on -#include "core/model.h" -#include "core/net.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/net.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/net/test_ppl_net.cpp b/tests/test_csrc/net/test_ppl_net.cpp index b5d34a8ab5..aa855bf00a 100644 --- a/tests/test_csrc/net/test_ppl_net.cpp +++ b/tests/test_csrc/net/test_ppl_net.cpp @@ -4,8 +4,8 @@ #include "catch.hpp" // clang-format on -#include "core/model.h" -#include "core/net.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/net.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/net/test_trt_net.cpp b/tests/test_csrc/net/test_trt_net.cpp index c1c579b2c4..b6ab080ee7 100644 --- a/tests/test_csrc/net/test_trt_net.cpp +++ b/tests/test_csrc/net/test_trt_net.cpp @@ -4,8 +4,8 @@ #include "catch.hpp" // clang-format on -#include "core/model.h" -#include "core/net.h" +#include "mmdeploy/core/model.h" +#include "mmdeploy/core/net.h" #include "test_resource.h" using namespace mmdeploy; diff --git a/tests/test_csrc/preprocess/test_collect.cpp b/tests/test_csrc/preprocess/test_collect.cpp index 0ac7e7091a..19ac7fef74 100644 --- a/tests/test_csrc/preprocess/test_collect.cpp +++ b/tests/test_csrc/preprocess/test_collect.cpp @@ -1,8 +1,8 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/tensor.h" -#include "preprocess/transform/transform.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/preprocess/transform/transform.h" using namespace mmdeploy; using namespace std; diff --git a/tests/test_csrc/preprocess/test_compose.cpp b/tests/test_csrc/preprocess/test_compose.cpp index 97e8ea452d..f2a7994e10 100644 --- a/tests/test_csrc/preprocess/test_compose.cpp +++ b/tests/test_csrc/preprocess/test_compose.cpp @@ -6,11 +6,11 @@ #include "catch.hpp" // clang-format on -#include "archive/json_archive.h" -#include "core/mat.h" -#include "core/registry.h" -#include "core/utils/formatter.h" #include "json.hpp" +#include "mmdeploy/archive/json_archive.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/registry.h" +#include "mmdeploy/core/utils/formatter.h" #include "opencv_utils.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_crop.cpp b/tests/test_csrc/preprocess/test_crop.cpp index b5958b4218..4f23e68a96 100644 --- a/tests/test_csrc/preprocess/test_crop.cpp +++ b/tests/test_csrc/preprocess/test_crop.cpp @@ -2,10 +2,10 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/mat.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_default_format_bundle.cpp b/tests/test_csrc/preprocess/test_default_format_bundle.cpp index 84c669b699..489e8a249d 100644 --- a/tests/test_csrc/preprocess/test_default_format_bundle.cpp +++ b/tests/test_csrc/preprocess/test_default_format_bundle.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/tensor.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_image2tensor.cpp b/tests/test_csrc/preprocess/test_image2tensor.cpp index 16939a09b2..199c2bc669 100644 --- a/tests/test_csrc/preprocess/test_image2tensor.cpp +++ b/tests/test_csrc/preprocess/test_image2tensor.cpp @@ -1,9 +1,9 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/tensor.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_load.cpp b/tests/test_csrc/preprocess/test_load.cpp index 47abe91b3b..fc825155c1 100644 --- a/tests/test_csrc/preprocess/test_load.cpp +++ b/tests/test_csrc/preprocess/test_load.cpp @@ -1,11 +1,11 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/mat.h" -#include "core/tensor.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_normalize.cpp b/tests/test_csrc/preprocess/test_normalize.cpp index bf96f55b23..2b976ed41e 100644 --- a/tests/test_csrc/preprocess/test_normalize.cpp +++ b/tests/test_csrc/preprocess/test_normalize.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/mat.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_pad.cpp b/tests/test_csrc/preprocess/test_pad.cpp index 338be4bbaf..77828b6251 100644 --- a/tests/test_csrc/preprocess/test_pad.cpp +++ b/tests/test_csrc/preprocess/test_pad.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/mat.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_resize.cpp b/tests/test_csrc/preprocess/test_resize.cpp index e5143f3091..8b7bb6bf80 100644 --- a/tests/test_csrc/preprocess/test_resize.cpp +++ b/tests/test_csrc/preprocess/test_resize.cpp @@ -1,10 +1,10 @@ // Copyright (c) OpenMMLab. All rights reserved. #include "catch.hpp" -#include "core/mat.h" -#include "core/utils/device_utils.h" +#include "mmdeploy/core/mat.h" +#include "mmdeploy/core/utils/device_utils.h" +#include "mmdeploy/preprocess/transform/transform.h" #include "opencv_utils.h" -#include "preprocess/transform/transform.h" #include "test_resource.h" #include "test_utils.h" diff --git a/tests/test_csrc/preprocess/test_utils.h b/tests/test_csrc/preprocess/test_utils.h index 64ecc23e40..dbdcf0f061 100644 --- a/tests/test_csrc/preprocess/test_utils.h +++ b/tests/test_csrc/preprocess/test_utils.h @@ -3,9 +3,9 @@ #ifndef MMDEPLOY_TEST_TRANSFORM_UTILS_H #define MMDEPLOY_TEST_TRANSFORM_UTILS_H -#include "core/tensor.h" -#include "core/value.h" -#include "preprocess/transform/transform.h" +#include "mmdeploy/core/tensor.h" +#include "mmdeploy/core/value.h" +#include "mmdeploy/preprocess/transform/transform.h" namespace mmdeploy::test { std::unique_ptr CreateTransform(const Value& cfg, Device device, Stream stream); diff --git a/tests/test_csrc/test_resource.h b/tests/test_csrc/test_resource.h index f59c79bf52..f6a3fb826c 100644 --- a/tests/test_csrc/test_resource.h +++ b/tests/test_csrc/test_resource.h @@ -9,7 +9,7 @@ #include #include -#include "core/utils/filesystem.h" +#include "mmdeploy/core/utils/filesystem.h" #include "test_define.h" using namespace std;