open-mmlab · lvhan028 · Mar 29, 2023 · Mar 23, 2023 · Mar 23, 2023 · Mar 27, 2023
diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml
@@ -0,0 +1,234 @@
+name: prebuild
+
+on:
+  push:
+    branches:
+      - main
+      - dev-1.x
+      - master
+    paths:
+      - "mmdeploy/version.py"
+
+permissions: write-all
+
+jobs:
+  linux_build:
+    runs-on: [self-hosted, linux-3090]
+    container:
+      image: openmmlab/mmdeploy:manylinux2014_x86_64-cuda11.3
+      options: "--gpus=all --ipc=host"
+      volumes:
+        - /data2/actions-runner/prebuild:/__w/mmdeploy/prebuild
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Get mmdeploy version
+        run: |
+          export MMDEPLOY_VERSION=$(python3 -c "import sys; sys.path.append('mmdeploy');from version import __version__;print(__version__)")
+          echo $MMDEPLOY_VERSION
+          echo "MMDEPLOY_VERSION=$MMDEPLOY_VERSION"  >> $GITHUB_ENV
+      - name: Build MMDeploy
+        run: |
+          source activate mmdeploy-3.6
+          pip install pyyaml packaging setuptools wheel
+          mkdir pack; cd pack
+          python ../tools/package_tools/generate_build_config.py --backend 'trt;ort' \
+            --system linux --output config.yml --build-mmdeploy
+          python ../tools/package_tools/mmdeploy_builder.py --config config.yml
+      - name: Build sdk cpu backend
+        run: |
+          source activate mmdeploy-3.6
+          cd pack
+          python ../tools/package_tools/generate_build_config.py --backend 'ort' \
+            --system linux --output config.yml --device cpu --build-sdk --build-sdk-monolithic \
+            --build-sdk-python --sdk-dynamic-net
+          python ../tools/package_tools/mmdeploy_builder.py --config config.yml
+      - name: Build sdk cuda backend
+        run: |
+          source activate mmdeploy-3.6
+          cd pack
+          python ../tools/package_tools/generate_build_config.py --backend 'ort;trt' \
+            --system linux --output config.yml --device cuda --build-sdk --build-sdk-monolithic \
+            --build-sdk-python --sdk-dynamic-net
+          python ../tools/package_tools/mmdeploy_builder.py --config config.yml
+      - name: Move artifact
+        run: |
+          mkdir -p /__w/mmdeploy/prebuild/$MMDEPLOY_VERSION
+          rm -rf /__w/mmdeploy/prebuild/$MMDEPLOY_VERSION/*
+          mv pack/* /__w/mmdeploy/prebuild/$MMDEPLOY_VERSION
+
+  linux_test:
+    runs-on: [self-hosted, linux-3090]
+    needs: linux_build
+    container:
+      image: openmmlab/mmdeploy:ubuntu20.04-cuda11.3
+      options: "--gpus=all --ipc=host"
+      volumes:
+        - /data2/actions-runner/prebuild:/__w/mmdeploy/prebuild
+        - /data2/actions-runner/testmodel:/__w/mmdeploy/testmodel
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Get mmdeploy version
+        run: |
+          export MMDEPLOY_VERSION=$(python3 -c "import sys; sys.path.append('mmdeploy');from version import __version__;print(__version__)")
+          echo $MMDEPLOY_VERSION
+          echo "MMDEPLOY_VERSION=$MMDEPLOY_VERSION"  >> $GITHUB_ENV
+      - name: Test python
+        run: |
+          cd /__w/mmdeploy/prebuild/$MMDEPLOY_VERSION
+          bash $GITHUB_WORKSPACE/tools/package_tools/test/test_sdk_python.sh
+      - name: Test c/cpp
+        run: |
+          cd /__w/mmdeploy/prebuild/$MMDEPLOY_VERSION
+          bash $GITHUB_WORKSPACE/tools/package_tools/test/test_sdk.sh
+
+  linux_upload:
+    runs-on: [self-hosted, linux-3090]
+    if: startsWith(github.ref, 'refs/tags/')
+    environment: 'prod'
+    needs: linux_test
+    env:
+      PREBUILD_DIR: /data2/actions-runner/prebuild
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Get mmdeploy version
+        run: |
+          export MMDEPLOY_VERSION=$(python3 -c "import sys; sys.path.append('mmdeploy');from version import __version__;print(__version__)")
+          echo $MMDEPLOY_VERSION
+          echo "MMDEPLOY_VERSION=$MMDEPLOY_VERSION"  >> $GITHUB_ENV
+      - name: Upload mmdeploy
+        run: |
+          cd $PREBUILD_DIR/$MMDEPLOY_VERSION/mmdeploy
+          pip install twine
+          # twine upload * --repository testpypi -u __token__ -p ${{ secrets.test_pypi_password }}
+          twine upload * -u __token__ -p ${{ secrets.pypi_password }}
+      - name: Upload mmdeploy_runtime
+        run: |
+          cd $PREBUILD_DIR/$MMDEPLOY_VERSION/mmdeploy_runtime
+          # twine upload * --repository testpypi -u __token__ -p ${{ secrets.test_pypi_password }}
+          twine upload * -u __token__ -p ${{ secrets.pypi_password }}
+      - name: Zip mmdeploy sdk
+        run: |
+          cd $PREBUILD_DIR/$MMDEPLOY_VERSION/sdk
+          for folder in *
+          do
+            tar czf $folder.tar.gz $folder
+          done
+      - name: Upload mmdeploy sdk
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+              $PREBUILD_DIR/$MMDEPLOY_VERSION/sdk/*.tar.gz
+
+
+  windows_build:
+    runs-on: [self-hosted, win10-3080]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Get mmdeploy version
+        run: |
+          conda activate mmdeploy-3.8
+          $env:MMDEPLOY_VERSION=(python -c "import sys; sys.path.append('mmdeploy');from version import __version__;print(__version__)")
+          echo $env:MMDEPLOY_VERSION
+          echo "MMDEPLOY_VERSION=$env:MMDEPLOY_VERSION"  >> $env:GITHUB_ENV
+      - name: Build MMDeploy
+        run: |
+          . D:\DEPS\cienv\prebuild_gpu_env.ps1
+          conda activate mmdeploy-3.6
+          mkdir pack; cd pack
+          python ../tools/package_tools/generate_build_config.py --backend 'trt;ort' `
+            --system windows --output config.yml --build-mmdeploy
+          python ../tools/package_tools/mmdeploy_builder.py --config config.yml
+      - name: Build sdk cpu backend
+        run: |
+          . D:\DEPS\cienv\prebuild_cpu_env.ps1
+          conda activate mmdeploy-3.6
+          cd pack
+          python ../tools/package_tools/generate_build_config.py --backend 'ort' `
+            --system windows --output config.yml --device cpu --build-sdk --build-sdk-monolithic `
+            --build-sdk-python --sdk-dynamic-net
+          python ../tools/package_tools/mmdeploy_builder.py --config config.yml
+      - name: Build sdk cuda backend
+        run: |
+          . D:\DEPS\cienv\prebuild_gpu_env.ps1
+          conda activate mmdeploy-3.6
+          cd pack
+          python ../tools/package_tools/generate_build_config.py --backend 'ort;trt' `
+            --system windows --output config.yml --device cuda --build-sdk --build-sdk-monolithic `
+            --build-sdk-python --sdk-dynamic-net
+          python ../tools/package_tools/mmdeploy_builder.py --config config.yml
+      - name: Move artifact
+        run: |
+          New-Item "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION" -ItemType Directory -Force
+          Remove-Item "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION/*" -Force -Recurse
+          Move-Item pack/* "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION"
+
+  windows_test:
+    runs-on: [self-hosted, win10-3080]
+    needs: windows_build
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Get mmdeploy version
+        run: |
+          conda activate mmdeploy-3.8
+          $env:MMDEPLOY_VERSION=(python -c "import sys; sys.path.append('mmdeploy');from version import __version__;print(__version__)")
+          echo $env:MMDEPLOY_VERSION
+          echo "MMDEPLOY_VERSION=$env:MMDEPLOY_VERSION"  >> $env:GITHUB_ENV
+      - name: Test python
+        run: |
+          cd "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION"
+          . D:\DEPS\cienv\prebuild_cpu_env.ps1
+          conda activate ci-test
+          & "$env:GITHUB_WORKSPACE/tools/package_tools/test/test_sdk_python.ps1"
+      - name: Test c/cpp
+        run: |
+          cd "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION"
+          . D:\DEPS\cienv\prebuild_cpu_env.ps1
+          & "$env:GITHUB_WORKSPACE/tools/package_tools/test/test_sdk.ps1"
+
+  windows_upload:
+    runs-on: [self-hosted, win10-3080]
+    if: startsWith(github.ref, 'refs/tags/')
+    environment: 'prod'
+    needs: windows_test
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Get mmdeploy version
+        run: |
+          conda activate mmdeploy-3.8
+          $env:MMDEPLOY_VERSION=(python -c "import sys; sys.path.append('mmdeploy');from version import __version__;print(__version__)")
+          echo $env:MMDEPLOY_VERSION
+          echo "MMDEPLOY_VERSION=$env:MMDEPLOY_VERSION"  >> $env:GITHUB_ENV
+      - name: Upload mmdeploy
+        run: |
+          cd "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION/mmdeploy"
+          conda activate mmdeploy-3.8
+          # twine upload * --repository testpypi -u __token__ -p ${{ secrets.test_pypi_password }}
+          twine upload * -u __token__ -p ${{ secrets.pypi_password }}
+      - name: Upload mmdeploy_runtime
+        run: |
+          cd "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION/mmdeploy_runtime"
+          conda activate mmdeploy-3.8
+          # twine upload * --repository testpypi -u __token__ -p ${{ secrets.test_pypi_password }}
+          twine upload * -u __token__ -p ${{ secrets.pypi_password }}
+      - name: Zip mmdeploy sdk
+        run: |
+          cd "D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION/sdk"
+          $folders = $(ls).Name
+          foreach ($folder in $folders) {
+            Compress-Archive -Path $folder -DestinationPath "$folder.zip"
+          }
+      - name: Upload mmdeploy sdk
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+              D:/DEPS/ciartifact/$env:MMDEPLOY_VERSION/sdk/*.zip
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,9 @@ repos:
     rev: 4.0.1
     hooks:
       - id: flake8
-        args: ["--exclude=*/client/inference_pb2.py,*/client/inference_pb2_grpc.py"]
+        args: ["--exclude=*/client/inference_pb2.py, \
+                */client/inference_pb2_grpc.py, \
+                tools/package_tools/packaging/setup.py"]
   - repo: https://github.com/PyCQA/isort
     rev: 5.11.5
     hooks:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,6 +3,7 @@ include mmdeploy/backend/ncnn/*.so
 include mmdeploy/backend/ncnn/*.dll
 include mmdeploy/backend/ncnn/*.pyd
 include mmdeploy/lib/*.so
+include mmdeploy/lib/*.so*
 include mmdeploy/lib/*.dll
 include mmdeploy/lib/*.pyd
 include mmdeploy/backend/torchscript/*.so

diff --git a/cmake/loader.cpp.in b/cmake/loader.cpp.in
@@ -23,11 +23,27 @@
 namespace mmdeploy {
 namespace {
 
+#ifdef _WIN32
+inline static const std::wstring GetDllPath() {
+    HMODULE hm = NULL;
+    GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+      (LPWSTR)&GetDllPath, &hm);
+    std::wstring ret;
+    ret.resize(MAX_PATH);
+    GetModuleFileNameW(hm, &ret[0], ret.size());
+    ret = ret.substr(0, ret.find_last_of(L"/\\"));
+    return ret;
+}
+#endif
+
 void* mmdeploy_load_library(const char* name) {
   fprintf(stderr, "loading %s ...\n", name);
 
 #ifdef _WIN32
-  auto handle = LoadLibraryExA(name, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+  auto handle = LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS);
+  if (handle == NULL) {
+    handle = LoadLibraryExA(name, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+  }
 #else
   auto handle = dlopen(name, RTLD_NOW | RTLD_GLOBAL);
 #endif
@@ -44,6 +60,9 @@ void* mmdeploy_load_library(const char* name) {
 class Loader {
  public:
   Loader() {
+#ifdef _WIN32
+    AddDllDirectory(GetDllPath().c_str());
+#endif
     const char* modules[] = {
         @_MMDEPLOY_DYNAMIC_MODULES@
     };

diff --git a/csrc/mmdeploy/apis/python/CMakeLists.txt b/csrc/mmdeploy/apis/python/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 
 cmake_minimum_required(VERSION 3.14)
-project(mmdeploy_python)
+project(mmdeploy_runtime)
 
-set(MMDEPLOY_PYTHON_SRCS
+set(MMDEPLOY_RUNTIME_SRCS
         common.cpp
         internal.cpp
         pipeline.cpp)
@@ -20,12 +20,21 @@ elseif (NOT TARGET pybind11)
 endif ()
 
 foreach (task_name ${MMDEPLOY_TASKS})
-    list(APPEND MMDEPLOY_PYTHON_SRCS ${task_name}.cpp)
+    list(APPEND MMDEPLOY_RUNTIME_SRCS ${task_name}.cpp)
 endforeach ()
 
-pybind11_add_module(${PROJECT_NAME} ${MMDEPLOY_PYTHON_SRCS})
+pybind11_add_module(${PROJECT_NAME} ${MMDEPLOY_RUNTIME_SRCS})
 # disable MMDEPLOY_CXX_USE_OPENCV in apis/cxx/mmdeploy/common.hpp
 target_compile_definitions(${PROJECT_NAME} PRIVATE -DMMDEPLOY_CXX_USE_OPENCV=0)
+if (APPLE)
+        set_target_properties(${PROJECT_NAME} PROPERTIES
+                BUILD_RPATH "@loader_path"
+                INSTALL_RPATH "@loader_path")
+else ()
+        set_target_properties(${PROJECT_NAME} PROPERTIES
+                BUILD_RPATH "\$ORIGIN"
+                INSTALL_RPATH "\$ORIGIN")
+endif ()
 
 # https://github.com/pybind/pybind11/issues/1604
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

diff --git a/csrc/mmdeploy/apis/python/common.cpp b/csrc/mmdeploy/apis/python/common.cpp
@@ -165,7 +165,7 @@ static PythonBindingRegisterer register_scheduler{[](py::module& m) {
 
 }  // namespace mmdeploy::python
 
-PYBIND11_MODULE(mmdeploy_python, m) {
+PYBIND11_MODULE(mmdeploy_runtime, m) {
   for (const auto& f : mmdeploy::python::gPythonBindings()) {
     f(m);
   }

diff --git a/csrc/mmdeploy/backend_ops/onnxruntime/CMakeLists.txt b/csrc/mmdeploy/backend_ops/onnxruntime/CMakeLists.txt
@@ -22,6 +22,15 @@ target_link_libraries(${PROJECT_NAME}_obj PUBLIC onnxruntime)
 
 mmdeploy_add_library(${PROJECT_NAME} SHARED EXCLUDE "")
 target_link_libraries(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_obj)
+if (APPLE)
+        set_target_properties(${PROJECT_NAME} PROPERTIES
+                BUILD_RPATH "@loader_path"
+                INSTALL_RPATH "@loader_path")
+else ()
+        set_target_properties(${PROJECT_NAME} PROPERTIES
+                BUILD_RPATH "\$ORIGIN"
+                INSTALL_RPATH "\$ORIGIN")
+endif ()
 add_library(mmdeploy::onnxruntime::ops ALIAS ${PROJECT_NAME})
 
 set(_ORT_OPS_DIR ${CMAKE_SOURCE_DIR}/mmdeploy/lib)

diff --git a/csrc/mmdeploy/device/cpu/cpu_device.cpp b/csrc/mmdeploy/device/cpu/cpu_device.cpp
@@ -18,7 +18,7 @@ class CpuHostMemory : public NonCopyable {
 #elif defined(ANDROID)
     posix_memalign(&data_, alignment, space);
 #else
-    data_ = std::aligned_alloc(alignment, space);
+    data_ = aligned_alloc(alignment, space);
 #endif
     if (!data_) {
       return Status(eOutOfMemory);

diff --git a/csrc/mmdeploy/net/trt/CMakeLists.txt b/csrc/mmdeploy/net/trt/CMakeLists.txt
@@ -10,6 +10,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE
 target_include_directories(${PROJECT_NAME} PRIVATE ${CUDNN_DIR}/include)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CUDA_TOOLKIT_ROOT_DIR}/include)
 target_link_libraries(${PROJECT_NAME} PRIVATE mmdeploy_tensorrt_ops_obj)
-target_link_libraries(${PROJECT_NAME} PUBLIC ${TENSORRT_LIBS} cudnn)
+target_link_libraries(${PROJECT_NAME} PUBLIC ${TENSORRT_LIBS} cudnn cuda)
 
 add_library(mmdeploy::trt_net ALIAS ${PROJECT_NAME})
diff --git a/demo/csrc/cpp/text_det_recog.cxx b/demo/csrc/cpp/text_det_recog.cxx
@@ -76,7 +76,7 @@ int main(int argc, char* argv[]) {
 
   auto output = pipeline.Apply(mat);
 
-  MMDEPLOY_INFO("output:\n{}", output);
+  // MMDEPLOY_INFO("output:\n{}", output);
 
   return 0;
 }
diff --git a/demo/python/det_pose.py b/demo/python/det_pose.py
@@ -3,7 +3,7 @@
 
 import cv2
 import numpy as np
-from mmdeploy_python import Detector, PoseDetector
+from mmdeploy_runtime import Detector, PoseDetector
 
 
 def parse_args():

diff --git a/demo/python/image_classification.py b/demo/python/image_classification.py
@@ -2,7 +2,7 @@
 import argparse
 
 import cv2
-from mmdeploy_python import Classifier
+from mmdeploy_runtime import Classifier
 
 
 def parse_args():