Cherry pick PR open-mmlab#1663, open-mmlab#1666, open-mmlab#1486 to d…

…ev-1.x Cherry pick PR 1663, 1666, 1486 to dev-1.x
lvhan028 · Jan 31, 2023 · 3bf1336 · 3bf1336
2 parents dc1d9df + 7d96969
commit 3bf1336
Show file tree

Hide file tree

Showing 67 changed files with 2,917 additions and 1,265 deletions.
diff --git a/csrc/mmdeploy/apis/c/CMakeLists.txt b/csrc/mmdeploy/apis/c/CMakeLists.txt
@@ -12,6 +12,9 @@ macro(add_object name)
         target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fvisibility=hidden>)
     endif ()
     target_link_libraries(${name} PRIVATE mmdeploy::core)
+    target_include_directories(${name} PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+            $<INSTALL_INTERFACE:include>)
     set(CAPI_OBJS ${CAPI_OBJS} ${name})
     mmdeploy_export(${name})
 endmacro()
@@ -31,6 +34,7 @@ foreach (TASK ${COMMON_LIST})
     mmdeploy_add_library(${TARGET_NAME})
     target_link_libraries(${TARGET_NAME} PRIVATE ${OBJECT_NAME})
     target_include_directories(${TARGET_NAME} PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
             $<INSTALL_INTERFACE:include>)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mmdeploy/${TASK}.h
             DESTINATION include/mmdeploy)

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/classifier.cpp b/csrc/mmdeploy/apis/c/mmdeploy/classifier.cpp
@@ -1,17 +1,17 @@
 // Copyright (c) OpenMMLab. All rights reserved.
 
-#include "classifier.h"
+#include "mmdeploy/classifier.h"
 
 #include <numeric>
 
-#include "common_internal.h"
-#include "handle.h"
 #include "mmdeploy/archive/value_archive.h"
 #include "mmdeploy/codebase/mmcls/mmcls.h"
+#include "mmdeploy/common_internal.h"
 #include "mmdeploy/core/device.h"
 #include "mmdeploy/core/graph.h"
 #include "mmdeploy/core/utils/formatter.h"
-#include "pipeline.h"
+#include "mmdeploy/handle.h"
+#include "mmdeploy/pipeline.h"
 
 using namespace mmdeploy;
 using namespace std;

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/classifier.h b/csrc/mmdeploy/apis/c/mmdeploy/classifier.h
@@ -8,9 +8,9 @@
 #ifndef MMDEPLOY_CLASSIFIER_H
 #define MMDEPLOY_CLASSIFIER_H
 
-#include "common.h"
-#include "executor.h"
-#include "model.h"
+#include "mmdeploy/common.h"
+#include "mmdeploy/executor.h"
+#include "mmdeploy/model.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/common.cpp b/csrc/mmdeploy/apis/c/mmdeploy/common.cpp
@@ -1,9 +1,9 @@
-#include "common.h"
+#include "mmdeploy/common.h"
 
-#include "common_internal.h"
-#include "executor_internal.h"
+#include "mmdeploy/common_internal.h"
 #include "mmdeploy/core/mat.h"
 #include "mmdeploy/core/profiler.h"
+#include "mmdeploy/executor_internal.h"
 
 mmdeploy_value_t mmdeploy_value_copy(mmdeploy_value_t value) {
   if (!value) {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/common_internal.h b/csrc/mmdeploy/apis/c/mmdeploy/common_internal.h
@@ -3,12 +3,12 @@
 #ifndef MMDEPLOY_CSRC_APIS_C_COMMON_INTERNAL_H_
 #define MMDEPLOY_CSRC_APIS_C_COMMON_INTERNAL_H_
 
-#include "common.h"
-#include "handle.h"
+#include "mmdeploy/common.h"
 #include "mmdeploy/core/mat.h"
 #include "mmdeploy/core/value.h"
-#include "model.h"
-#include "pipeline.h"
+#include "mmdeploy/handle.h"
+#include "mmdeploy/model.h"
+#include "mmdeploy/pipeline.h"
 
 using namespace mmdeploy;
 

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/detector.cpp b/csrc/mmdeploy/apis/c/mmdeploy/detector.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) OpenMMLab. All rights reserved.
 
-#include "detector.h"
+#include "mmdeploy/detector.h"
 
 #include <deque>
 #include <numeric>

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/detector.h b/csrc/mmdeploy/apis/c/mmdeploy/detector.h
@@ -8,9 +8,9 @@
 #ifndef MMDEPLOY_DETECTOR_H
 #define MMDEPLOY_DETECTOR_H
 
-#include "common.h"
-#include "executor.h"
-#include "model.h"
+#include "mmdeploy/common.h"
+#include "mmdeploy/executor.h"
+#include "mmdeploy/model.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/executor.cpp b/csrc/mmdeploy/apis/c/mmdeploy/executor.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) OpenMMLab. All rights reserved.
 
-#include "executor.h"
+#include "mmdeploy/executor.h"
 
-#include "common.h"
-#include "common_internal.h"
-#include "executor_internal.h"
+#include "mmdeploy/common.h"
+#include "mmdeploy/common_internal.h"
 #include "mmdeploy/execution/when_all_value.h"
+#include "mmdeploy/executor_internal.h"
 
 using namespace mmdeploy;
 

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/executor.h b/csrc/mmdeploy/apis/c/mmdeploy/executor.h
@@ -3,7 +3,7 @@
 #ifndef MMDEPLOY_CSRC_APIS_C_EXECUTOR_H_
 #define MMDEPLOY_CSRC_APIS_C_EXECUTOR_H_
 
-#include "common.h"
+#include "mmdeploy/common.h"
 
 #if __cplusplus
 extern "C" {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/executor_internal.h b/csrc/mmdeploy/apis/c/mmdeploy/executor_internal.h
@@ -3,8 +3,8 @@
 #ifndef MMDEPLOY_CSRC_APIS_C_EXECUTOR_INTERNAL_H_
 #define MMDEPLOY_CSRC_APIS_C_EXECUTOR_INTERNAL_H_
 
-#include "executor.h"
 #include "mmdeploy/execution/schedulers/registry.h"
+#include "mmdeploy/executor.h"
 
 using namespace mmdeploy;
 

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/model.cpp b/csrc/mmdeploy/apis/c/mmdeploy/model.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) OpenMMLab. All rights reserved.
 
 // clang-format off
-#include "model.h"
+#include "mmdeploy/model.h"
 
 #include <memory>
 
-#include "common_internal.h"
+#include "mmdeploy/common_internal.h"
 #include "mmdeploy/core/logger.h"
 #include "mmdeploy/core/model.h"
 // clang-format on

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/model.h b/csrc/mmdeploy/apis/c/mmdeploy/model.h
@@ -8,7 +8,7 @@
 #ifndef MMDEPLOY_SRC_APIS_C_MODEL_H_
 #define MMDEPLOY_SRC_APIS_C_MODEL_H_
 
-#include "common.h"
+#include "mmdeploy/common.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/pipeline.cpp b/csrc/mmdeploy/apis/c/mmdeploy/pipeline.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) OpenMMLab. All rights reserved.
 
-#include "pipeline.h"
+#include "mmdeploy/pipeline.h"
 
-#include "common_internal.h"
-#include "executor_internal.h"
-#include "handle.h"
+#include "mmdeploy/common_internal.h"
+#include "mmdeploy/executor_internal.h"
+#include "mmdeploy/handle.h"
 
 int mmdeploy_pipeline_create_v3(mmdeploy_value_t config, mmdeploy_context_t context,
                                 mmdeploy_pipeline_t* pipeline) {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/pipeline.h b/csrc/mmdeploy/apis/c/mmdeploy/pipeline.h
@@ -3,8 +3,8 @@
 #ifndef MMDEPLOY_CSRC_APIS_C_PIPELINE_H_
 #define MMDEPLOY_CSRC_APIS_C_PIPELINE_H_
 
-#include "common.h"
-#include "executor.h"
+#include "mmdeploy/common.h"
+#include "mmdeploy/executor.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/pose_detector.cpp b/csrc/mmdeploy/apis/c/mmdeploy/pose_detector.cpp
@@ -1,17 +1,17 @@
 // Copyright (c) OpenMMLab. All rights reserved.
 
-#include "pose_detector.h"
+#include "mmdeploy/pose_detector.h"
 
 #include <numeric>
 
-#include "common_internal.h"
-#include "handle.h"
 #include "mmdeploy/codebase/mmpose/mmpose.h"
+#include "mmdeploy/common_internal.h"
 #include "mmdeploy/core/device.h"
 #include "mmdeploy/core/graph.h"
 #include "mmdeploy/core/mat.h"
 #include "mmdeploy/core/utils/formatter.h"
-#include "pipeline.h"
+#include "mmdeploy/handle.h"
+#include "mmdeploy/pipeline.h"
 
 using namespace std;
 using namespace mmdeploy;
@@ -117,7 +117,7 @@ int mmdeploy_pose_detector_create_input(const mmdeploy_mat_t* mats, int mat_coun
       } else {
         b = {0, 0, img.width(), img.height(), 1.0};
       }
-      input_images.push_back({{"ori_img", img}, {"bbox", std::move(b)}, {"rotation", 0.f}});
+      input_images.push_back({{"ori_img", img}, {"bbox", std::move(b)}});
     };
 
     for (int i = 0; i < mat_count; ++i) {

diff --git a/csrc/mmdeploy/apis/c/mmdeploy/pose_detector.h b/csrc/mmdeploy/apis/c/mmdeploy/pose_detector.h
@@ -8,9 +8,9 @@
 #ifndef MMDEPLOY_SRC_APIS_C_POSE_DETECTOR_H_
 #define MMDEPLOY_SRC_APIS_C_POSE_DETECTOR_H_
 
-#include "common.h"
-#include "executor.h"
-#include "model.h"
+#include "mmdeploy/common.h"
+#include "mmdeploy/executor.h"
+#include "mmdeploy/model.h"
 
 #ifdef __cplusplus
 extern "C" {