cherry-pick #1855, #1806, #1798

Sync master to dev-1.x

Author: lvhan028

CMakeLists.txt

@@ -99,10 +99,12 @@ include(cmake/MMDeploy.cmake)
 add_subdirectory(csrc/mmdeploy)
 
 if (MMDEPLOY_BUILD_SDK)
-    install(TARGETS MMDeployStaticModules
-            MMDeployDynamicModules
-            MMDeployLibs
-            EXPORT MMDeployTargets)
+    if (NOT MMDEPLOY_BUILD_SDK_MONOLITHIC)
+        install(TARGETS MMDeployStaticModules
+                MMDeployDynamicModules
+                MMDeployLibs
+                EXPORT MMDeployTargets)
+    endif ()
 
     if (MMDEPLOY_BUILD_TEST)
         add_subdirectory(tests/test_csrc)

cmake/MMDeploy.cmake

@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 
-function (mmdeploy_export NAME)
+function (mmdeploy_export_impl NAME)
     set(_LIB_DIR lib)
     if (MSVC)
         set(_LIB_DIR bin)
@@ -15,13 +15,22 @@ endfunction ()
 macro(mmdeploy_add_net NAME)
     if (MMDEPLOY_DYNAMIC_BACKEND)
         mmdeploy_add_library(${NAME} SHARED ${ARGN})
+        # DYNAMIC_BACKEND implies BUILD_SDK_MONOLITHIC
+        mmdeploy_export_impl(${NAME})
         target_link_libraries(${PROJECT_NAME} PRIVATE mmdeploy)
         set(BACKEND_LIB_NAMES ${BACKEND_LIB_NAMES} ${PROJECT_NAME} PARENT_SCOPE)
     else ()
         mmdeploy_add_module(${NAME} ${ARGN})
     endif ()
 endmacro()
 
+function (mmdeploy_export NAME)
+    if (NOT MMDEPLOY_BUILD_SDK_MONOLITHIC)
+        mmdeploy_export_impl(${NAME})
+    endif ()
+endfunction ()
+
+
 function (mmdeploy_add_library NAME)
     # EXCLUDE: exclude from registering & exporting
     cmake_parse_arguments(_MMDEPLOY "EXCLUDE" "" "" ${ARGN})

csrc/mmdeploy/apis/c/CMakeLists.txt

@@ -89,5 +89,5 @@ if (MMDEPLOY_BUILD_SDK_CSHARP_API OR MMDEPLOY_BUILD_SDK_MONOLITHIC)
                     INSTALL_RPATH "\$ORIGIN"
                     BUILD_RPATH "\$ORIGIN")
     endif ()
-    mmdeploy_export(mmdeploy)
+    mmdeploy_export_impl(mmdeploy)
 endif ()

csrc/mmdeploy/apis/cxx/CMakeLists.txt

@@ -34,7 +34,7 @@ if (TARGET mmdeploy)
 else ()
     target_link_libraries(${PROJECT_NAME} INTERFACE mmdeploy::core)
 endif ()
-mmdeploy_export(${PROJECT_NAME})
+mmdeploy_export_impl(${PROJECT_NAME})
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mmdeploy/common.hpp
         DESTINATION include/mmdeploy)
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/demo/csrc/ DESTINATION example/cpp

csrc/mmdeploy/core/device.h

@@ -7,12 +7,14 @@
 #include <functional>
 #include <memory>
 #include <optional>
+#include <ostream>
 #include <string>
 #include <vector>
 
 #include "mmdeploy/core/macro.h"
 #include "mmdeploy/core/mpl/type_traits.h"
 #include "mmdeploy/core/status_code.h"
+#include "mmdeploy/core/utils/formatter.h"
 
 namespace mmdeploy {
 
@@ -97,6 +99,11 @@ class Device {
     return PlatformId(platform_id_);
   }
 
+  friend std::ostream& operator<<(std::ostream& os, const Device& device) {
+    os << "(" << device.platform_id_ << ", " << device.device_id_ << ")";
+    return os;
+  }
+
  private:
   int platform_id_{0};
   int device_id_{0};
@@ -112,6 +119,9 @@ class MMDEPLOY_API Platform {
   // throws if not found
   explicit Platform(int platform_id);
 
+  // bind device with the current thread
+  Result<void> Bind(Device device, Device* prev);
+
   // -1 if invalid
   int GetPlatformId() const;
 
@@ -135,6 +145,27 @@ class MMDEPLOY_API Platform {
 
 MMDEPLOY_API const char* GetPlatformName(PlatformId id);
 
+class DeviceGuard {
+ public:
+  explicit DeviceGuard(Device device) : platform_(device.platform_id()) {
+    auto r = platform_.Bind(device, &prev_);
+    if (!r) {
+      MMDEPLOY_ERROR("failed to bind device {}: {}", device, r.error().message().c_str());
+    }
+  }
+
+  ~DeviceGuard() {
+    auto r = platform_.Bind(prev_, nullptr);
+    if (!r) {
+      MMDEPLOY_ERROR("failed to unbind device {}: {}", prev_, r.error().message().c_str());
+    }
+  }
+
+ private:
+  Platform platform_;
+  Device prev_;
+};
+
 class MMDEPLOY_API Stream {
  public:
   Stream() = default;

csrc/mmdeploy/core/device_impl.cpp

@@ -54,6 +54,8 @@ Platform::Platform(int platform_id) {
   }
 }
 
+Result<void> Platform::Bind(Device device, Device* prev) { return impl_->BindDevice(device, prev); }
+
 const char* GetPlatformName(PlatformId id) {
   if (auto impl = gPlatformRegistry().GetPlatformImpl(id); impl) {
     return impl->GetPlatformName();

csrc/mmdeploy/core/device_impl.h

@@ -27,7 +27,7 @@ class PlatformImpl {
 
   virtual void SetPlatformId(int id) { platform_id_ = id; }
 
-  virtual Result<void> SetDevice(Device device) { return success(); };
+  virtual Result<void> BindDevice(Device device, Device* prev) = 0;
 
   virtual shared_ptr<BufferImpl> CreateBuffer(Device device) = 0;
 

csrc/mmdeploy/core/registry.h

@@ -129,6 +129,9 @@ class Registry : public Registry<void> {
   using Signature = GetSignature<Tag>;
   using CreatorType = Creator<Signature>;
 
+  // workaround for gcc-10.2 (https://github.com/open-mmlab/mmdeploy/issues/1796)
+  Registry() : Registry<void>{} {}
+
   bool Add(CreatorType& creator) & { return AddCreator(creator); }
 
   CreatorType* Get(const string_view& name, int version) & {

csrc/mmdeploy/device/cpu/cpu_device.cpp

@@ -70,6 +70,14 @@ class CpuHostMemory : public NonCopyable {
 ////////////////////////////////////////////////////////////////////////////////
 /// CpuPlatformImpl
 
+Result<void> CpuPlatformImpl::BindDevice(Device device, Device* prev) {
+  // do nothing
+  if (prev) {
+    *prev = device;
+  }
+  return success();
+}
+
 shared_ptr<BufferImpl> CpuPlatformImpl::CreateBuffer(Device device) {
   return std::make_shared<CpuBufferImpl>(device);
 }

csrc/mmdeploy/device/cpu/cpu_device.h

@@ -17,6 +17,8 @@ class CpuPlatformImpl : public PlatformImpl {
 
   const char* GetPlatformName() const noexcept override;
 
+  Result<void> BindDevice(Device device, Device* prev) override;
+
   shared_ptr<BufferImpl> CreateBuffer(Device device) override;
 
   shared_ptr<StreamImpl> CreateStream(Device device) override;