[Fix] disable building demos when preparing prebuilt package (#1803)

* disable building demos when preparing prebuilt package * update * update * fix ci errors * fix circleci error * fix github ci by using default build options * update
2025-01-14 08:09:43 +08:00 · 2023-02-24 17:08:17 +08:00 · 2023-02-24 17:08:17 +08:00 · cdfe18dfdb
commit cdfe18dfdb
parent bf36950f0e
10 changed files with 21 additions and 17 deletions
--- a/.github/workflows/backend-ascend.yml
+++ b/.github/workflows/backend-ascend.yml
@ -50,5 +50,5 @@ jobs:
          mkdir -p build && pushd build
          source $GITHUB_WORKSPACE/Ascend/ascend-toolkit/set_env.sh
          export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/Ascend/ascend-toolkit/latest/runtime/lib64/stub:$LD_LIBRARY_PATH
-          cmake .. -DCMAKE_CXX_COMPILER=g++-7    -DMMDEPLOY_SHARED_LIBS=ON   -DMMDEPLOY_BUILD_SDK=ON       -DMMDEPLOY_BUILD_SDK_PYTHON_API=OFF  -DMMDEPLOY_TARGET_DEVICES=cpu   -DMMDEPLOY_BUILD_EXAMPLES=ON    -DMMDEPLOY_TARGET_BACKENDS=acl  -DMMDEPLOY_CODEBASES=all
+          cmake .. -DMMDEPLOY_BUILD_SDK=ON -DMMDEPLOY_BUILD_EXAMPLES=ON -DMMDEPLOY_TARGET_BACKENDS=acl
          make install -j4
--- a/.github/workflows/backend-coreml.yml
+++ b/.github/workflows/backend-coreml.yml
@ -39,22 +39,21 @@ jobs:
          wget https://github.com/irexyc/mmdeploy-ci-resource/releases/download/libtorch/libtorch-osx-arm64-1.8.0.tar.gz
          mkdir $GITHUB_WORKSPACE/libtorch-install
          tar xf libtorch-osx-arm64-1.8.0.tar.gz -C $GITHUB_WORKSPACE/libtorch-install
-      - name: build
+      - name: build-static-lib
        run: |
          mkdir build && cd build
          cmake .. -DCMAKE_OSX_ARCHITECTURES="arm64" \
            -DCMAKE_SYSTEM_PROCESSOR="arm64" \
            -DMMDEPLOY_BUILD_SDK=ON \
-            -DMMDEPLOY_TARGET_DEVICES="cpu" \
-            -DMMDEPLOY_CODEBASES=all \
            -DOpenCV_DIR=$GITHUB_WORKSPACE/opencv-install/lib/cmake/opencv4 \
            -DTorch_DIR=$GITHUB_WORKSPACE/libtorch-install/share/cmake/Torch \
            -DMMDEPLOY_TARGET_BACKENDS="coreml" \
            -DMMDEPLOY_BUILD_EXAMPLES=ON \
+            -DMMDEPLOY_BUILD_SDK_MONOLITHIC=OFF \
            -DMMDEPLOY_SHARED_LIBS=OFF
          cmake --build . -j 3
          cmake --build . --target install
-      - name: build-shared
+      - name: build-monolithic-lib
        run: |
          mkdir build-shared && cd build-shared
          cmake .. -DCMAKE_OSX_ARCHITECTURES="arm64" \
@ -65,7 +64,8 @@ jobs:
            -DOpenCV_DIR=$GITHUB_WORKSPACE/opencv-install/lib/cmake/opencv4 \
            -DTorch_DIR=$GITHUB_WORKSPACE/libtorch-install/share/cmake/Torch \
            -DMMDEPLOY_TARGET_BACKENDS="coreml" \
-            -DMMDEPLOY_BUILD_EXAMPLES=ON \
-            -DMMDEPLOY_SHARED_LIBS=ON
+            -DMMDEPLOY_BUILD_SDK_MONOLITHIC=ON \
+            -DMMDEPLOY_SHARED_LIBS=OFF \
+            -DMMDEPLOY_BUILD_EXAMPLES=ON
          cmake --build . -j 3
          cmake --build . --target install
--- a/.github/workflows/backend-snpe.yml
+++ b/.github/workflows/backend-snpe.yml
@ -47,7 +47,7 @@ jobs:
          export SNPE_ROOT=/home/runner/work/mmdeploy/mmdeploy/snpe-1.59.0.3230
          export LD_LIBRARY_PATH=${SNPE_ROOT}/lib/x86_64-linux-clang:${LD_LIBRARY_PATH}
          export MMDEPLOY_SNPE_X86_CI=1
-          cmake .. -DCMAKE_CXX_COMPILER=g++-7    -DMMDEPLOY_SHARED_LIBS=ON   -DMMDEPLOY_BUILD_SDK=ON       -DMMDEPLOY_BUILD_SDK_PYTHON_API=OFF  -DMMDEPLOY_TARGET_DEVICES=cpu       -DMMDEPLOY_TARGET_BACKENDS=snpe  -DMMDEPLOY_CODEBASES=all
+          cmake .. -DMMDEPLOY_BUILD_SDK=ON -DMMDEPLOY_TARGET_BACKENDS=snpe
          make -j2
          make install
          pushd install/example
--- a/.github/workflows/linux-riscv64-gcc.yml
+++ b/.github/workflows/linux-riscv64-gcc.yml
@ -45,12 +45,9 @@ jobs:
          cmake .. \
            -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/riscv64-linux-gnu.cmake \
            -DMMDEPLOY_BUILD_SDK=ON \
-            -DMMDEPLOY_SHARED_LIBS=ON \
            -DMMDEPLOY_BUILD_EXAMPLES=ON \
-            -DMMDEPLOY_TARGET_DEVICES="cpu" \
            -DMMDEPLOY_TARGET_BACKENDS="ncnn" \
            -Dncnn_DIR=$GITHUB_WORKSPACE/ncnn-install/lib/cmake/ncnn/ \
-            -DMMDEPLOY_CODEBASES=all \
            -DOpenCV_DIR=$GITHUB_WORKSPACE/opencv-install/lib/cmake/opencv4
          make -j$(nproc)
          make install
--- a/cmake/MMDeployConfig.cmake.in
+++ b/cmake/MMDeployConfig.cmake.in
@ -15,7 +15,7 @@ set(MMDEPLOY_VERSION_MAJOR @MMDEPLOY_VERSION_MAJOR@)
 set(MMDEPLOY_VERSION_MINOR @MMDEPLOY_VERSION_MINOR@)
 set(MMDEPLOY_VERSION_PATCH @MMDEPLOY_VERSION_PATCH@)

-if (NOT MMDEPLOY_BUILD_SHARED)
+if (NOT MMDEPLOY_BUILD_SHARED AND NOT MMDEPLOY_BUILD_SDK_MONOLITHIC)
    if ("cuda" IN_LIST MMDEPLOY_TARGET_DEVICES)
        find_package(CUDA REQUIRED)
        if(MSVC)
--- a/csrc/mmdeploy/apis/cxx/CMakeLists.txt
+++ b/csrc/mmdeploy/apis/cxx/CMakeLists.txt
@ -31,6 +31,8 @@ if (TARGET mmdeploy)
                $<INSTALL_INTERFACE:include/mmdeploy/third_party>)
    endif ()
    target_link_libraries(mmdeploy INTERFACE ${PROJECT_NAME})
+else ()
+    target_link_libraries(${PROJECT_NAME} INTERFACE mmdeploy::core)
 endif ()
 mmdeploy_export(${PROJECT_NAME})
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mmdeploy/common.hpp
--- a/csrc/mmdeploy/apis/cxx/mmdeploy/common.hpp
+++ b/csrc/mmdeploy/apis/cxx/mmdeploy/common.hpp
@ -6,6 +6,7 @@
 #include <memory>
 #include <type_traits>
 #include <utility>
+#include <vector>

 #include "mmdeploy/common.h"
 #include "mmdeploy/core/mpl/span.h"
--- a/csrc/mmdeploy/apis/python/CMakeLists.txt
+++ b/csrc/mmdeploy/apis/python/CMakeLists.txt
@ -24,15 +24,21 @@ foreach (task_name ${MMDEPLOY_TASKS})
 endforeach ()

 pybind11_add_module(${PROJECT_NAME} ${MMDEPLOY_PYTHON_SRCS})
+# disable MMDEPLOY_CXX_USE_OPENCV in apis/cxx/mmdeploy/common.hpp
+target_compile_definitions(${PROJECT_NAME} PRIVATE -DMMDEPLOY_CXX_USE_OPENCV=0)

 # https://github.com/pybind/pybind11/issues/1604
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    target_compile_options(${PROJECT_NAME} PRIVATE -fsized-deallocation)
 endif ()

-mmdeploy_load_static(${PROJECT_NAME} MMDeployStaticModules)
-mmdeploy_load_dynamic(${PROJECT_NAME} MMDeployDynamicModules)
-target_link_libraries(${PROJECT_NAME} PRIVATE MMDeployLibs)
+if (MMDEPLOY_BUILD_SDK_MONOLITHIC)
+    target_link_libraries(${PROJECT_NAME} PRIVATE mmdeploy)
+else ()
+    mmdeploy_load_static(${PROJECT_NAME} MMDeployStaticModules)
+    mmdeploy_load_dynamic(${PROJECT_NAME} MMDeployDynamicModules)
+    target_link_libraries(${PROJECT_NAME} PRIVATE MMDeployLibs)
+endif ()

 target_include_directories(${PROJECT_NAME} PRIVATE
        ${CMAKE_CURRENT_SOURCE_DIR}/..
--- a/tools/package_tools/configs/linux_x64.yaml
+++ b/tools/package_tools/configs/linux_x64.yaml
@ -3,7 +3,6 @@ global_config:
    CMAKE_CXX_COMPILER: "g++-7"
    MMDEPLOY_BUILD_SDK: "ON"
    MMDEPLOY_BUILD_SDK_MONOLITHIC: "ON"
-    MMDEPLOY_BUILD_EXAMPLES: "ON"
    MMDEPLOY_SHARED_LIBS: "OFF"
    OpenCV_DIR: "${OpenCV_DIR}"

--- a/tools/package_tools/configs/windows_x64.yaml
+++ b/tools/package_tools/configs/windows_x64.yaml
@ -3,7 +3,6 @@ global_config:
  cmake_envs:
    MMDEPLOY_BUILD_SDK: "ON"
    MMDEPLOY_BUILD_SDK_MONOLITHIC: "ON"
-    MMDEPLOY_BUILD_EXAMPLES: "ON"
    MMDEPLOY_SHARED_LIBS: "OFF"
    MMDEPLOY_CODEBASES: "all"
    OpenCV_DIR: "%OpenCV_DIR%"