humu789
diff --git a/‎.github/workflows/lint.yml
+1-1 b/‎.github/workflows/lint.yml
+1-1
diff --git a/‎.pre-commit-config.yaml
+3-3 b/‎.pre-commit-config.yaml
+3-3
diff --git a/‎CMakeLists.txt
+11 b/‎CMakeLists.txt
+11
diff --git a/‎cmake/MMDeploy.cmake
+11 b/‎cmake/MMDeploy.cmake
+11
diff --git a/‎cmake/MMDeployConfig.cmake.in
+16 b/‎cmake/MMDeployConfig.cmake.in
+16
diff --git a/‎cmake/modules/FindCUDNN.cmake
+36 b/‎cmake/modules/FindCUDNN.cmake
+36
diff --git a/‎cmake/modules/FindONNXRUNTIME.cmake
+36 b/‎cmake/modules/FindONNXRUNTIME.cmake
+36
diff --git a/‎cmake/modules/FindTENSORRT.cmake
+49 b/‎cmake/modules/FindTENSORRT.cmake
+49
diff --git a/‎cmake/tensorrt.cmake
+2 b/‎cmake/tensorrt.cmake
+2
diff --git a/‎configs/_base_/backends/torchscript.py
+1 b/‎configs/_base_/backends/torchscript.py
+1
diff --git a/‎configs/_base_/torchscript_config.py
+6 b/‎configs/_base_/torchscript_config.py
+6
diff --git a/‎configs/mmcls/classification_torchscript.py
+6 b/‎configs/mmcls/classification_torchscript.py
+6
diff --git a/‎configs/mmdet/_base_/base_instance-seg_torchscript.py
+4 b/‎configs/mmdet/_base_/base_instance-seg_torchscript.py
+4
diff --git a/‎configs/mmdet/_base_/base_torchscript.py
+16 b/‎configs/mmdet/_base_/base_torchscript.py
+16
diff --git a/‎configs/mmdet/detection/detection_torchscript.py
+3 b/‎configs/mmdet/detection/detection_torchscript.py
+3
diff --git a/‎configs/mmdet/instance-seg/instance-seg_torchscript.py
+4 b/‎configs/mmdet/instance-seg/instance-seg_torchscript.py
+4
diff --git a/‎configs/mmdet3d/voxel-detection/voxel-detection_dynamic.py
+15 b/‎configs/mmdet3d/voxel-detection/voxel-detection_dynamic.py
+15
diff --git a/‎configs/mmdet3d/voxel-detection/voxel-detection_onnxruntime_dynamic.py
+3 b/‎configs/mmdet3d/voxel-detection/voxel-detection_onnxruntime_dynamic.py
+3
diff --git a/‎configs/mmdet3d/voxel-detection/voxel-detection_openvino_dynamic_kitti.py
+9 b/‎configs/mmdet3d/voxel-detection/voxel-detection_openvino_dynamic_kitti.py
+9
diff --git a/‎configs/mmdet3d/voxel-detection/voxel-detection_openvino_dynamic_nus.py
+9 b/‎configs/mmdet3d/voxel-detection/voxel-detection_openvino_dynamic_nus.py
+9
diff --git a/‎configs/mmdet3d/voxel-detection/voxel-detection_static.py
+6 b/‎configs/mmdet3d/voxel-detection/voxel-detection_static.py
+6
diff --git a/‎configs/mmdet3d/voxel-detection/voxel-detection_tensorrt_dynamic-kitti.py
+18 b/‎configs/mmdet3d/voxel-detection/voxel-detection_tensorrt_dynamic-kitti.py
+18
diff --git a/‎configs/mmdet3d/voxel-detection/voxel-detection_tensorrt_dynamic-nus.py
+18 b/‎configs/mmdet3d/voxel-detection/voxel-detection_tensorrt_dynamic-nus.py
+18
diff --git a/‎configs/mmedit/super-resolution/super-resolution_torchscript.py
+7 b/‎configs/mmedit/super-resolution/super-resolution_torchscript.py
+7
diff --git a/‎configs/mmocr/text-detection/text-detection_torchscript.py
+7 b/‎configs/mmocr/text-detection/text-detection_torchscript.py
+7
diff --git a/‎configs/mmocr/text-recognition/text-recognition_torchscript.py
+7 b/‎configs/mmocr/text-recognition/text-recognition_torchscript.py
+7
@@ -30,7 +30,7 @@ jobs:
       - name: Check docstring coverage
         run: |
           pip install interrogate
-          interrogate -v --ignore-init-method --ignore-module --ignore-private --ignore-nested-functions --ignore-nested-classes --fail-under 95 mmdeploy
+          interrogate -v --ignore-init-method --ignore-module --ignore-private --ignore-nested-functions --ignore-nested-classes --fail-under 80 mmdeploy
       - name: Check pylint score
         run: |
           pip install pylint
 
@@ -8,11 +8,11 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-yapf
-    rev: v0.30.0
+    rev: v0.32.0
     hooks:
       - id: yapf
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.1.0
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
       - id: check-yaml
@@ -42,7 +42,7 @@ repos:
         args: ["--skip=third_party/*,*.proto"]
 
   - repo: https://github.com/myint/docformatter
-    rev: v1.3.1
+    rev: v1.4
     hooks:
       - id: docformatter
         args: ["--in-place", "--wrap-descriptions", "79"]
 
@@ -82,6 +82,13 @@ if (MMDEPLOY_BUILD_SDK)
             FILE MMDeployTargets.cmake
             DESTINATION lib/cmake/MMDeploy)
 
+    # append backend deps
+    mmdeploy_add_deps(trt BACKENDS ${MMDEPLOY_TARGET_BACKENDS} DEPS TENSORRT CUDNN)
+    mmdeploy_add_deps(ort BACKENDS ${MMDEPLOY_TARGET_BACKENDS} DEPS ONNXRUNTIME)
+    mmdeploy_add_deps(ncnn BACKENDS ${MMDEPLOY_TARGET_BACKENDS} DEPS ncnn)
+    mmdeploy_add_deps(openvino BACKENDS ${MMDEPLOY_TARGET_BACKENDS} DEPS InferenceEngine)
+    mmdeploy_add_deps(pplnn BACKENDS ${MMDEPLOY_TARGET_BACKENDS} DEPS pplnn)
+
     include(CMakePackageConfigHelpers)
     # generate the config file that is includes the exports
     configure_package_config_file(${CMAKE_SOURCE_DIR}/cmake/MMDeployConfig.cmake.in
@@ -104,6 +111,10 @@ if (MMDEPLOY_BUILD_SDK)
             ${CMAKE_CURRENT_SOURCE_DIR}/cmake/loader.cpp.in
             DESTINATION lib/cmake/MMDeploy
             )
+    install(DIRECTORY
+            ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
+            DESTINATION lib/cmake/MMDeploy
+            )
 
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/demo/csrc/ DESTINATION example)
 endif ()
@@ -149,3 +149,14 @@ function (mmdeploy_load_dynamic NAME)
                 -Wl,--as-needed)
     endif ()
 endfunction ()
+
+macro(mmdeploy_add_deps backend)
+    set(multiValueArgs BACKENDS DEPS)
+    cmake_parse_arguments(INFO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    set(has_backend OFF)
+    if (${backend} IN_LIST INFO_BACKENDS)
+        foreach(pkg IN LISTS INFO_DEPS)
+            set(${pkg}_DEPENDENCY "find_package(${pkg} REQUIRED)")
+        endforeach()
+    endif()
+endmacro()
@@ -12,12 +12,28 @@ set(MMDEPLOY_BUILD_SHARED @BUILD_SHARED_LIBS@)
 
 if (NOT MMDEPLOY_BUILD_SHARED)
     if ("cuda" IN_LIST MMDEPLOY_TARGET_DEVICES)
+        find_package(CUDA REQUIRED)
+        if(MSVC)
+            set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc.exe)
+        else()
+            set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc)
+        endif()
         set(CMAKE_CUDA_RUNTIME_LIBRARY Shared)
         enable_language(CUDA)
         find_package(pplcv REQUIRED)
     endif ()
 endif ()
 
+set(MMDEPLOY_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
+list(APPEND CMAKE_MODULE_PATH ${MMDEPLOY_MODULE_PATH})
+@TENSORRT_DEPENDENCY@
+@CUDNN_DEPENDENCY@
+@ONNXRUNTIME_DEPENDENCY@
+@ncnn_DEPENDENCY@
+@InferenceEngine_DEPENDENCY@
+@pplnn_DEPENDENCY@
+list(REMOVE_ITEM CMAKE_MODULE_PATH ${MMDEPLOY_MODULE_PATH})
+
 find_package(spdlog REQUIRED)
 find_package(OpenCV REQUIRED)
 
 
@@ -0,0 +1,36 @@
+# Copyright (c) OpenMMLab. All rights reserved.
+
+if (NOT DEFINED CUDNN_DIR)
+    set(CUDNN_DIR $ENV{CUDNN_DIR})
+endif ()
+
+find_path(
+    CUDNN_INCLUDE_DIR cudnn.h
+    HINTS ${CUDNN_DIR} ${CUDA_TOOLKIT_ROOT_DIR}
+    PATH_SUFFIXES include)
+
+find_library(
+    CUDNN_LIBRARY_CUDNN_PATH cudnn
+    HINTS ${CUDNN_DIR} ${CUDA_TOOLKIT_ROOT_DIR}
+    PATH_SUFFIXES lib lib64 lib/x64)
+
+if (NOT (CUDNN_INCLUDE_DIR AND CUDNN_LIBRARY_CUDNN_PATH))
+    message(FATAL_ERROR "Couldn't find cuDNN in CUDNN_DIR: ${CUDNN_DIR}, "
+        "or in CUDA_TOOLKIT_ROOT_DIR: ${CUDA_TOOLKIT_ROOT_DIR}, "
+        "please check if the path is correct.")
+endif()
+
+add_library(cudnn SHARED IMPORTED)
+set_property(TARGET cudnn APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+if (MSVC)
+    set_target_properties(cudnn PROPERTIES
+        IMPORTED_IMPLIB_RELEASE ${CUDNN_LIBRARY_CUDNN_PATH}
+        INTERFACE_INCLUDE_DIRECTORIES ${CUDNN_INCLUDE_DIR}
+    )
+
+else()
+    set_target_properties(cudnn PROPERTIES
+        IMPORTED_LOCATION_RELEASE ${CUDNN_LIBRARY_CUDNN_PATH}
+        INTERFACE_INCLUDE_DIRECTORIES ${CUDNN_INCLUDE_DIR}
+    )
+endif()
@@ -0,0 +1,36 @@
+# Copyright (c) OpenMMLab. All rights reserved.
+
+if (NOT DEFINED ONNXRUNTIME_DIR)
+    set(ONNXRUNTIME_DIR $ENV{ONNXRUNTIME_DIR})
+endif ()
+if (NOT ONNXRUNTIME_DIR)
+    message(FATAL_ERROR "Please set ONNXRUNTIME_DIR with cmake -D option.")
+endif()
+
+find_path(
+    ONNXRUNTIME_INCLUDE_DIR onnxruntime_cxx_api.h
+    HINTS ${ONNXRUNTIME_DIR}
+    PATH_SUFFIXES include)
+find_library(
+    ONNXRUNTIME_LIBRARY_ONNXRUNTIME_PATH onnxruntime
+    HINTS ${ONNXRUNTIME_DIR}
+    PATH_SUFFIXES lib lib64 lib/x64)
+if (NOT (ONNXRUNTIME_INCLUDE_DIR AND ONNXRUNTIME_LIBRARY_ONNXRUNTIME_PATH))
+    message(FATAL_ERROR "Couldn't find onnxruntime in ONNXRUNTIME_DIR: "
+        "${ONNXRUNTIME_DIR}, please check if the path is correct.")
+endif()
+
+add_library(onnxruntime SHARED IMPORTED)
+set_property(TARGET onnxruntime APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+if (MSVC)
+    set_target_properties(onnxruntime PROPERTIES
+        IMPORTED_IMPLIB_RELEASE ${ONNXRUNTIME_LIBRARY_ONNXRUNTIME_PATH}
+        INTERFACE_INCLUDE_DIRECTORIES ${ONNXRUNTIME_INCLUDE_DIR}
+    )
+
+else()
+    set_target_properties(onnxruntime PROPERTIES
+        IMPORTED_LOCATION_RELEASE ${ONNXRUNTIME_LIBRARY_ONNXRUNTIME_PATH}
+        INTERFACE_INCLUDE_DIRECTORIES ${ONNXRUNTIME_INCLUDE_DIR}
+    )
+endif()
@@ -0,0 +1,49 @@
+# Copyright (c) OpenMMLab. All rights reserved.
+
+if (NOT DEFINED TENSORRT_DIR)
+    set(TENSORRT_DIR $ENV{TENSORRT_DIR})
+endif ()
+if (NOT TENSORRT_DIR)
+    message(FATAL_ERROR "Please set TENSORRT_DIR with cmake -D option.")
+endif()
+
+find_path(
+    TENSORRT_INCLUDE_DIR NvInfer.h
+    HINTS ${TENSORRT_DIR}
+    PATH_SUFFIXES include)
+
+if (NOT TENSORRT_INCLUDE_DIR)
+    message(FATAL_ERROR "Cannot find TensorRT header NvInfer.h, "
+        "please check if the path is correct")
+endif ()
+
+set(__TENSORRT_LIB_COMPONENTS nvinfer;nvinfer_plugin)
+foreach(__component ${__TENSORRT_LIB_COMPONENTS})
+    find_library(
+        __component_path ${__component}
+        HINTS ${TENSORRT_DIR}
+        PATH_SUFFIXES lib lib64 lib/x64)
+    if (NOT __component_path)
+        message(FATAL_ERROR "Cannot find TensorRT lib ${__component}, "
+            "please check if the path is correct")
+    endif()
+
+    add_library(${__component} SHARED IMPORTED)
+    set_property(TARGET ${__component} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+    if (MSVC)
+        set_target_properties(
+            ${__component} PROPERTIES
+            IMPORTED_IMPLIB_RELEASE ${__component_path}
+            INTERFACE_INCLUDE_DIRECTORIES ${TENSORRT_INCLUDE_DIR}
+        )
+    else()
+        set_target_properties(
+            ${__component} PROPERTIES
+            IMPORTED_LOCATION_RELEASE ${__component_path}
+            INTERFACE_INCLUDE_DIRECTORIES ${TENSORRT_INCLUDE_DIR}
+        )
+    endif()
+    unset(__component_path CACHE)
+endforeach()
+
+set(TENSORRT_LIBS ${__TENSORRT_LIB_COMPONENTS})
@@ -1,5 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 include(${CMAKE_SOURCE_DIR}/cmake/cuda.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/modules/FindTENSORRT.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/modules/FindCUDNN.cmake)
 find_path(
         TENSORRT_INCLUDE_DIR NvInfer.h
         HINTS ${TENSORRT_DIR} ${CUDA_TOOLKIT_ROOT_DIR}
 
@@ -0,0 +1 @@
+backend_config = dict(type='torchscript')
@@ -0,0 +1,6 @@
+ir_config = dict(
+    type='torchscript',
+    save_file='end2end.pt',
+    input_names=['input'],
+    output_names=['output'],
+    input_shape=None)
@@ -0,0 +1,6 @@
+_base_ = [
+    '../_base_/torchscript_config.py', '../_base_/backends/torchscript.py'
+]
+
+ir_config = dict(input_shape=None)
+codebase_config = dict(type='mmcls', task='Classification')
@@ -0,0 +1,4 @@
+_base_ = ['./base_torchscript.py']
+
+ir_config = dict(output_names=['dets', 'labels', 'masks'])
+codebase_config = dict(post_processing=dict(export_postprocess_mask=False))
@@ -0,0 +1,16 @@
+_base_ = ['../../_base_/torchscript_config.py']
+
+ir_config = dict(output_names=['dets', 'labels'])
+codebase_config = dict(
+    type='mmdet',
+    task='ObjectDetection',
+    model_type='end2end',
+    post_processing=dict(
+        score_threshold=0.05,
+        confidence_threshold=0.005,  # for YOLOv3
+        iou_threshold=0.5,
+        max_output_boxes_per_class=200,
+        pre_top_k=5000,
+        keep_top_k=100,
+        background_label_id=-1,
+    ))
@@ -0,0 +1,3 @@
+_base_ = [
+    '../_base_/base_torchscript.py', '../../_base_/backends/torchscript.py'
+]
@@ -0,0 +1,4 @@
+_base_ = [
+    '../_base_/base_instance-seg_torchscript.py',
+    '../../_base_/backends/torchscript.py'
+]
@@ -0,0 +1,15 @@
+_base_ = ['./voxel-detection_static.py']
+
+onnx_config = dict(
+    dynamic_axes={
+        'voxels': {
+            0: 'voxels_num',
+        },
+        'num_points': {
+            0: 'voxels_num',
+        },
+        'coors': {
+            0: 'voxels_num',
+        }
+    },
+    input_shape=None)
@@ -0,0 +1,3 @@
+_base_ = [
+    './voxel-detection_dynamic.py', '../../_base_/backends/onnxruntime.py'
+]
@@ -0,0 +1,9 @@
+_base_ = ['./voxel-detection_dynamic.py', '../../_base_/backends/openvino.py']
+
+onnx_config = dict(input_shape=None)
+
+backend_config = dict(model_inputs=[
+    dict(
+        opt_shapes=dict(
+            voxels=[5000, 32, 4], num_points=[5000], coors=[5000, 4]))
+])
@@ -0,0 +1,9 @@
+_base_ = ['./voxel-detection_dynamic.py', '../../_base_/backends/openvino.py']
+
+onnx_config = dict(input_shape=None)
+
+backend_config = dict(model_inputs=[
+    dict(
+        opt_shapes=dict(
+            voxels=[20000, 20, 5], num_points=[20000], coors=[20000, 4]))
+])
@@ -0,0 +1,6 @@
+_base_ = ['../../_base_/onnx_config.py']
+codebase_config = dict(
+    type='mmdet3d', task='VoxelDetection', model_type='end2end')
+onnx_config = dict(
+    input_names=['voxels', 'num_points', 'coors'],
+    output_names=['scores', 'bbox_preds', 'dir_scores'])
@@ -0,0 +1,18 @@
+_base_ = ['./voxel-detection_dynamic.py', '../../_base_/backends/tensorrt.py']
+backend_config = dict(
+    common_config=dict(max_workspace_size=1 << 30),
+    model_inputs=[
+        dict(
+            input_shapes=dict(
+                voxels=dict(
+                    min_shape=[2000, 32, 4],
+                    opt_shape=[5000, 32, 4],
+                    max_shape=[9000, 32, 4]),
+                num_points=dict(
+                    min_shape=[2000], opt_shape=[5000], max_shape=[9000]),
+                coors=dict(
+                    min_shape=[2000, 4],
+                    opt_shape=[5000, 4],
+                    max_shape=[9000, 4]),
+            ))
+    ])
@@ -0,0 +1,18 @@
+_base_ = ['./voxel-detection_dynamic.py', '../../_base_/backends/tensorrt.py']
+backend_config = dict(
+    common_config=dict(max_workspace_size=1 << 30),
+    model_inputs=[
+        dict(
+            input_shapes=dict(
+                voxels=dict(
+                    min_shape=[5000, 20, 5],
+                    opt_shape=[20000, 20, 5],
+                    max_shape=[30000, 20, 5]),
+                num_points=dict(
+                    min_shape=[5000], opt_shape=[20000], max_shape=[30000]),
+                coors=dict(
+                    min_shape=[5000, 4],
+                    opt_shape=[20000, 4],
+                    max_shape=[30000, 4]),
+            ))
+    ])
@@ -0,0 +1,7 @@
+_base_ = [
+    '../../_base_/torchscript_config.py',
+    '../../_base_/backends/torchscript.py'
+]
+
+ir_config = dict(input_shape=None)
+codebase_config = dict(type='mmedit', task='SuperResolution')
@@ -0,0 +1,7 @@
+_base_ = [
+    '../../_base_/torchscript_config.py',
+    '../../_base_/backends/torchscript.py'
+]
+
+ir_config = dict(input_shape=None)
+codebase_config = dict(type='mmocr', task='TextDetection')
@@ -0,0 +1,7 @@
+_base_ = [
+    '../../_base_/torchscript_config.py',
+    '../../_base_/backends/torchscript.py'
+]
+
+ir_config = dict(input_shape=None)
+codebase_config = dict(type='mmocr', task='TextRecognition')
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+backend_config = dict(type='torchscript')`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+_base_ = [`
	`2`	`+ '../_base_/base_torchscript.py', '../../_base_/backends/torchscript.py'`
	`3`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+_base_ = [`
	`2`	`+ './voxel-detection_dynamic.py', '../../_base_/backends/onnxruntime.py'`
	`3`	`+]`