Commit Graph

161 Commits (14b2bfd524d197565621fedbc47b5940bb22ceed)

Author SHA1 Message Date
lzhangzz 640aa03538
Support Windows (#106)
* minor changes

* support windows

* fix GCC build

* fix lint

* reformat

* fix Windows build

* fix GCC build

* search backend ops for onnxruntime

* fix lint

* fix lint

* code clean-up

* code clean-up

* fix clang build

* fix trt support

* fix cmake for ncnn

* fix cmake for openvino

* fix SDK Python API

* handle ops for other backends (ncnn, trt)

* handle SDK Python API library location

* robustify linkage

* fix cuda

* minor fix for openvino & ncnn

* use CMAKE_CUDA_ARCHITECTURES if set

* fix cuda preprocessor

* fix misc

* fix pplnn & pplcv, drop support for pplcv<0.6.0

* robustify cmake

* update build.md (#2)

* build dynamic modules as module library & fix demo (partially)

* fix candidate path for mmdeploy_python

* move "enable CUDA" to cmake config for demo

* refine demo cmake

* add comment

* fix ubuntu build

* revert docs/en/build.md

* fix C API

* fix lint

* Windows build doc (#3)

* check in docs related to mmdeploy build on windows

* update build guide on windows platform

* update build guide on windows platform

* make path of thirdparty libraries consistent

* make path consistency

* correct build command for custom ops

* correct build command for sdk

* update sdk build instructions

* update doc

* correct build command

* fix lint

* correct build command and fix lint

Co-authored-by: lvhan <lvhan@pjlab.org>

* trailing whitespace (#4)

* minor fix

* fix sr sdk model

* fix type deduction

* fix cudaFree after driver shutting down

* update ppl.cv installation warning (#5)

* fix device allocator threshold & fix lint

* update doc (#6)

* update ppl.cv installation warning

* missing 'git clone'

Co-authored-by: chenxin <chenxin2@sensetime.com>
Co-authored-by: zhangli <zhangli@sensetime.com>
Co-authored-by: lvhan028 <lvhan_028@163.com>
Co-authored-by: lvhan <lvhan@pjlab.org>
2022-02-24 20:08:44 +08:00
q.yao e9ee21fc1d
support export hardsigmoid in torch<=1.8 (#169)
* support export hardsigmoid in torch<=1.8

* fix lint
2022-02-24 16:10:42 +08:00
Zaida Zhou f0c110e6e6
Add a new pre-commit-hook to automatically add a copyright (#166)
* Add a new pre-commit-hook to automatically add copyright

* Add a new pre-commit-hook to automatically add copyright

* append 'demo' and 'tools' directories to .pre-commit-config.yaml
2022-02-23 11:38:40 +08:00
RunningLeon 787ebc2392
[Feature]: Support mmpose (#94)
* add mmpose code

* update

* update

* add rewrites

* test trt

* test litehrnet with trt

* revert unused change

* add docs about mmpose

* add docstring and staticmethod

* update

* update

* update docs

* fix config name and docs

* add pose_detection ut

* add pose data

* fix lint of model.py

* add pose_detection_model ut

* fix docs and docstrinf

* add test_mmpose_models.py

* fix yapf

* fix lint

* fix create input

* support ort ut

* fix yapf

* fix docs

* fix createinput

* test ci bug

* rm test1.py

* fix yapf

* fix flake8

* fix yapf

* add config and update benchmark

* fix table format

* update mmpose benchmark

* update benchmark for mmpose

* run mmpose tests seperately in ci

* fix lint

* resolve comments

* add trt ut config

* fix test

* fix tests

* resolve comments

* resolve comments

* update tests

Co-authored-by: VVsssssk <shenkun@pjlab.org.cn>
Co-authored-by: hanrui1sensetime <hanrui1@sensetime.com>
2022-02-16 11:03:12 +08:00
AllentDan a2b3ab3d7f
Fix ci for mmocr (#144)
* fix mmocr unittests

* remove useless

* lock mmdet maximum version to 2.20

* pip install -U numpy
2022-02-10 11:43:27 +08:00
lvhan028 e855ee4d54
[Enhancement] upgrade isort in pre-commit config (#141)
* [Enhancement] upgrade isort in pre-commit config by refering to mmflow pr #87

* fix lint

* remove .isort.cfg and put its known_third_party to setup.cfg
2022-02-09 17:27:50 +08:00
RunningLeon 0556feec79
Replace convert_syncbatchnorm in mmseg (#93)
* replace convert_syncbatchnorm with revert_sync_batchnorm from mmcv

* change logger
2022-01-26 11:07:28 +08:00
hanrui1sensetime e6e32a9db4
[Feature] add yolox ncnn (#29)
* add yolox ncnn

* add ncnn android performance of yolox

* add ut

* fix lint

* fix None bugs for ncnn

* test codecov

* test codecov

* add device

* fix yapf

* remove if-else for img shape

* use channelshuffle optimize

* change benchmark after channelshuffle

* fix yapf

* fix yapf

* fuse continuous reshape

* fix static shape deploy

* fix code

* drop pad

* only static shape

* fix static

* fix docstring
2022-01-19 13:54:45 +08:00
Semyon Bevzyuk 997d111a6f
[Fix] Fixed device_id in tools/test.py for the CPU. (#58)
* [Fix] fix bugs for mmcls performance test (#269)

* fix bugs for mmcls performance test

* fix yapf

* add comments of CLASSES attribute

* Rewrote the dictionary traversal for new versions of Python.

* Fix device_id for cpu

* Rewrite parse_device_id and tests

* Added None for cpu

Co-authored-by: hanrui1sensetime <83800577+hanrui1sensetime@users.noreply.github.com>
2022-01-13 15:37:23 +08:00
Yifan Zhou 12ee956d36
[Enhancement]: Remove deepcopy in patch_model (#61)
* Remove deepcopy

* Fix test
2022-01-13 11:16:16 +08:00
q.yao d157243077
[Fix] move target_wrapper into utils (#20)
* move target_wrapper into utils

* fix for lint

* add typehint and docstring

* update unit test

* fix isort

* update import
2022-01-11 15:43:47 +08:00
hanrui1sensetime 9fd15e3843
[Unittest] Add L2Norm unittest for default backend. (#43)
* add l2norm ut

* fix yapf

* fix test bugs

* fix yapf

* fix is_backend_output
2022-01-10 16:19:30 +08:00
AllentDan dbc12686ea
[Enhancement] use mmcv.utils.get_logger (#24)
* use mmcv.utils.get_logger

* add a unit test

* fix ut

* refine docstring

* fix lint
2022-01-10 15:46:42 +08:00
Yifan Zhou 3e5c785d9a
[Fix] Support MMDet custom dataset (#33)
* Fix mmdet classes

* Fix classes in data_cfg
2022-01-10 10:40:47 +08:00
Yifan Zhou 1a040036cc
[Fix] Avoid outputing empty tensor in NMS (#42)
* Remove slick op

* Fix tests

* Fix tests

* fix tests
2022-01-07 13:35:49 +08:00
Semyon Bevzyuk 3fd17ab6ff
[Refactoring]: Add get_dynamic_axes. (#36)
* [Fix] fix bugs for mmcls performance test (#269)

* fix bugs for mmcls performance test

* fix yapf

* add comments of CLASSES attribute

* Fix input name

* support all codebases and update dump info

* fix docstring

* Added random names.

* onnx_config -> ir_config

* fix test

* fix test

* add a TODO

* use self.output_names

* Fixes

* Rewrite test_torch2onnx.

* Add get_dynamic_axes.

* Fix TestGetDynamicAxes

Co-authored-by: hanrui1sensetime <83800577+hanrui1sensetime@users.noreply.github.com>
Co-authored-by: AllentDan <AllentDan@yeah.net>
Co-authored-by: grimoire <yaoqian@sensetime.com>
2022-01-06 11:21:48 +08:00
Semyon Bevzyuk 8cdb4abcc9
[Fix] Fix input names (#12)
* [Fix] fix bugs for mmcls performance test (#269)

* fix bugs for mmcls performance test

* fix yapf

* add comments of CLASSES attribute

* Fix input name

* support all codebases and update dump info

* fix docstring

* Added random names.

* onnx_config -> ir_config

* fix test

* fix test

* add a TODO

* use self.output_names

* Fixes

* Rewrite test_torch2onnx.

Co-authored-by: hanrui1sensetime <83800577+hanrui1sensetime@users.noreply.github.com>
Co-authored-by: AllentDan <AllentDan@yeah.net>
Co-authored-by: grimoire <yaoqian@sensetime.com>
2021-12-30 19:56:03 +08:00
VVsssssk f6dcd390e1
fix ops unit test (#332) 2021-12-23 16:43:30 +08:00
VVsssssk 9d4d52078b
【Fix】Fix ppl bug about grid sample (#325)
* fix ppl problems

* fix roialign

* fix grid_sampler bug

* fix grid sampler

* fix config

* fix test
2021-12-23 12:11:07 +08:00
lvhan028 e10a1b7c9e
Add more demos (#305)
* add more examples

* change to restore's output image to BGR

* use BUILD_SHARED_LIBS

* update graph module's cmake

* add condition for spdlog package

* change cmakelists

* update cmakelists

* add device_name in each demo

* remove duplicate cmake function

* use palette to draw segmentation's result

* no need to find_package(pplnn) when use MMDeploy's static libs

* remove MMDeploy_LIBS' dependency on spdlog

* #include <opencv2/imgproc/imgproc.hpp>

* change from mmdeploy_core to mmdeploy::core
2021-12-21 21:32:39 +08:00
hanrui1sensetime 33bde90744
[Fix] Fix unittest of ncnn. (#309)
* fix test_pytorch_functions

* fix test_mmocr_models
2021-12-21 18:03:50 +08:00
RunningLeon b060908a58
fix ut (#311) 2021-12-21 11:56:51 +08:00
lzhangzz 43e6714f47
[SDK] Fix asan errors (#308)
* fix several heap-use-after-free bugs

* rebase master

* add option for sanitizers

* rebase master

* fix conflicts
2021-12-21 10:47:21 +08:00
RunningLeon d9b23bfc6f
[fix]: get tensor for DataContainer case (#307)
* fix DataContainer case for get_tensor_from_input

* fix docstring
2021-12-20 19:49:44 +08:00
Yifan Zhou 0f9f0a60e4
[Enhancement]: Update configs for OpenVINO (#306)
* Update config for OpenVINO

* Update test

* Update better test

* Update instance-seg config of OpenVINO
2021-12-20 17:56:25 +08:00
q.yao abdf64a576
[Fix] support ncnn faster-rcnn (#304)
* wtf

* Support fcos ncnn end2end

* support ncnn two stage detector

* fix test
2021-12-20 15:43:38 +08:00
RunningLeon fabdb473bb
Update ncnn test (#298)
* update ncnn test

* type hint

* update test ocr

* update mmseg ut

* ignore ncnn rpn head test

* add logging

* fix ssd base dense head test

* recover bacth in ncnn wrapper

* fix ncnn_ops_ut

* fix yapf

* recover test ops

* fix run_with_backend False

* Revert "fix run_with_backend False"

This reverts commit 83f8f915a25e800f5c2db339584d164ba40b2d9b.

* disable ncnn test test_pytorch_functions.py

Co-authored-by: hanrui1sensetime <83800577+hanrui1sensetime@users.noreply.github.com>
Co-authored-by: hanrui1sensetime <hanrui1@sensetime.com>
2021-12-20 14:05:13 +08:00
RunningLeon ab5c51f3ab
fix mmdet tests (#302)
* fix mmdet tests

* fix
2021-12-18 14:36:54 +08:00
lvhan028 3be1779e66
Refactor tests (#283)
* fix sdk model's pipeline.json

* resize INT64 mask

* refactor unit tests

* fix api in model.h

* remove 'customs' from meta info

* fix zip model

* fix clang-format issue

* put tc on each backend into a SECTION

* change SECTION title

* add DYNAMIC_SECTION for capi unit test

* change 'devices' to 'device_names'

* change trt to tensorrt

* remove uncessary check

* add color_type 'color_ignore_orientation' which is used in ocr

* 'min_width', 'max_width' and 'backend' might be null in pipeline config

* fix clang-format issue

* remove useless code
2021-12-17 19:57:37 +08:00
AllentDan f94d7b5abe
[Feature] Dump jsons to SDK (#279)
* save cods

* save codes

* save codes

* add docstring and fix ut

* use Resize to replace img_scale

* use Dict instead of dict()

* net && weights

* resolve comments

* update pipeline

* update pipeline

* update pipeline

* refactor preprocess

* merge master

* use imagetotensor

* use imagetotensor

* fix typos and improve docstring

* resolve comments

* update lq to img in mmedit

* add mask_thr_binary

* refactor dump info

* resolve comments

* add instance seg to dump info temperarily

* update meta_keys

* update meta_keys

* add meta_keys condition

* update postprocess for mmseg
2021-12-17 11:39:16 +08:00
hanrui1sensetime 3e8237d8bb
[Feature] Support end2end mmdet2.19 retina mobilessd (#286)
* support end2end mmdet2.19 retina mobilessd

* fix yapf

* add end2end fsaf

* fix lint

* fix comments

* fix lint

* add static configs

* fix docformatter

* move ssdhead

* add rewrite for l2norm

* fix ncnn ssd

* fix isort

* rename config

* add ssd_head_ut

* fix string

* align ssd

* remove unused bbox rewriter

Co-authored-by: grimoire <yaoqian@sensetime.com>
Co-authored-by: maningsheng <mnsheng@yeah.net>
2021-12-17 10:46:54 +08:00
lzhangzz a494a6f6ff
[SDK] sync changes according to performance benchmarks (#297)
* sync SDK changes according to performance benchmarks

* fix end-of-file lint

* fix clang-format issue

* fix clang-format by adding 'clang-format off'

* remove useless casts

* remove 'data' argument of 'operator()'

* change 'Tensor2Img' to 'TensorToImg' according to spec

* correct tensor's name according spec

Co-authored-by: lvhan028 <lvhan_028@163.com>
2021-12-16 13:51:22 +08:00
Yifan Zhou 78b37bbd32
[Fix]: Fix rewriter conflict when processing derived class (#289)
* Fix rewriter

* lint

* rename function and update docstring

* use is class

* Update docstring
2021-12-14 15:40:29 +08:00
AllentDan 0dea300714
[Fix] Reanme ppl to pplnn for all cases (#273)
* add speed benchmark for pplnn and replace all ppl in docs with pplnn

* replace ppl with pplnn for all codes

* docs zh

* fix crnn config path

* update docstring

* rename

* update ppl to pplnn in readme_zh

Co-authored-by: maningsheng <mnsheng@yeah.net>
2021-12-14 15:04:39 +08:00
RunningLeon 0b23c744fc
remove trt in config (#280) 2021-12-13 19:57:15 +08:00
Semyon Bevzyuk a96e5f9d76
[Fix] Fix VFNet test (#281)
* [Fix] fix bugs for mmcls performance test (#269)

* fix bugs for mmcls performance test

* fix yapf

* add comments of CLASSES attribute

* Fix test_get_bboxes_of_vfnet_head

* Fix

Co-authored-by: hanrui1sensetime <83800577+hanrui1sensetime@users.noreply.github.com>
2021-12-13 10:43:39 +08:00
VVsssssk 54885e5972
【Feature】Support for mmdet2.19 (#253)
* add one-stage support

* add two-stage support

* fix docstring

* add base_dense_head docstring

* fix docstrign

* fix ncnn code

* fix anchor head

* fix unit test about mmdet model

* fix unit test

* fix base dense head bug:

* fix basehead

* fix basedense head

* fix pad bug

* fix bboxhead

* add rewrite about decode

* fix decode

* rename func

* fix test_mmdet_core and test_object_detection_model

* format test

* fix comments

* remove to(device)

* fix requirements

* fix docs

* fix yolox evaluate butg
2021-12-10 14:03:23 +08:00
Yifan Zhou 4149228716
[Enhancement]: Import codebase only when it is required (#266)
* Add import codebase

* lint

* Fix import order

* typo

* Fix partition

* docstring

* lint
2021-12-10 11:34:22 +08:00
Semyon Bevzyuk 3659b515eb
[Enhancement]: The ability to sort the dataset in tools/test.py. (#244)
* Add sort-data arg to test.py

* Set is_sort_dataset to True.

* Add a check for the possibility of sorting.

* lint

* Added mmdeploy.utils.dataset.

* Add unit test

Co-authored-by: SingleZombie <singlezombie@163.com>
2021-12-09 16:21:50 +08:00
RunningLeon c213879103
fix yolov3 head test with ncnn (#267)
* fix yolov3 head test with ncnn

* add ncnn test

* remove ncnn test
2021-12-09 11:56:12 +08:00
hanrui1sensetime 30af457b5e
[Feature] Support mobilenetv2ssdlite ncnn end2end deployment. (#259)
* support ssdlitemobilenetv2

* fix yapf

* fix ut try

* fix ut try

* try to fix ut

* fix ut general 320->128

* move onnx ops to mmcv

* fix lint

* fix docformatter

* increase doc coverage

* refact self defined ops

* fix yapf

* add description

* fix isort

* fix comments

* fix comments

* fix lint

* sigmoid after concat
2021-12-09 11:55:38 +08:00
RunningLeon d96ee9e9f3
Change op domain (#262)
* change domain to mmdeploy

* update tests

* resolve comments
2021-12-08 15:06:41 +08:00
Yifan Zhou 03c95a1149
[Enhancement]: Optimize config utils (#263)
* Optimize config utils

* Update `get_backend`

* Add assert
2021-12-08 14:55:59 +08:00
lvhan028 36124f6205
Merge sdk (#251)
* check in cmake

* move backend_ops to csrc/backend_ops

* check in preprocess, model, some codebase and their c-apis

* check in CMakeLists.txt

* check in parts of test_csrc

* commit everything else

* add readme

* update core's BUILD_INTERFACE directory

* skip codespell on third_party

* update trt_net and ort_net's CMakeLists

* ignore clion's build directory

* check in pybind11

* add onnx.proto. Remove MMDeploy's dependency on ncnn's source code

* export MMDeployTargets only when MMDEPLOY_BUILD_SDK is ON

* remove useless message

* target include directory is wrong

* change target name from mmdeploy_ppl_net to mmdeploy_pplnn_net

* skip install directory

* update project's cmake

* remove useless code

* set CMAKE_BUILD_TYPE to Release by force if it isn't set by user

* update custom ops CMakeLists

* pass object target's source lists

* fix lint end-of-file

* fix lint: trailing whitespace

* fix codespell hook

* remove bicubic_interpolate to csrc/backend_ops/

* set MMDEPLOY_BUILD_SDK OFF

* change custom ops build command

* add spdlog installation command

* update docs on how to checkout pybind11

* move bicubic_interpolate to backend_ops/tensorrt directory

* remove useless code

* correct cmake

* fix typo

* fix typo

* fix install directory

* correct sdk's readme

* set cub dir when cuda version < 11.0

* change directory where clang-format will apply to

* fix build command

* add .clang-format

* change clang-format style from google to file

* reformat csrc/backend_ops

* format sdk's code

* turn off clang-format for some files

* add -Xcompiler=-fno-gnu-unique

* fix trt topk initialize

* check in config for sdk demo

* update cmake script and csrc's readme

* correct config's path

* add cuda include directory, otherwise compile failed in case of tensorrt8.2

* clang-format onnx2ncnn.cpp

Co-authored-by: zhangli <lzhang329@gmail.com>
Co-authored-by: grimoire <yaoqian@sensetime.com>
2021-12-07 10:57:55 +08:00
RunningLeon 9e82851a73
[Feature] end2end yolov3 with ncnn (#248)
* support yolov3 ncnn with Yolov3DetectionOutput

* update nms

* fix contiguous in ncnn wrapper

* remove padding to detectionoutput

* format cpp

* Revert "format cpp"

This reverts commit 54050b19cd80d2f8cd851d82a755fd2c8d6c779d.

* fix zero detection

* fix yapf

* onnx2ncnn.cpp

* fix ut

* fix isort

* fix clang-format

* format cpp

* resolve comments

* resolve comments

* fix ut of ncnnend2endmodel

* fix yapf

* fix return list;

Co-authored-by: hanrui1sensetime <hanrui1@sensetime.com>
2021-12-06 19:01:36 +08:00
Yifan Zhou cc72c00e61
[Fix]: Fix homonymic rewriters bugs (#242)
* Fix bug

* license
2021-12-03 18:31:58 +08:00
AllentDan 66d5cddbdc
[Enhancement] Add bicubic resize plugin for tensorrt (#238)
* save codes

* enable export fake bicubic interpolate op to onnx

* save codes

* enable bicubic interpolate trt plugin

* static export

* enable visualize but need align acc

* use torch bicubic upsample

* add unit tests for bicubic interpolate

* fix unit tests

* change mmedit config

* remove useless comments

* remove useless comments

* resolve comments

* fix lint

* clang-format

Co-authored-by: grimoire <yaoqian@sensetime.com>
2021-12-01 16:31:10 +08:00
RunningLeon 3b97f64385
Support YOLOX with TensorRT (#237)
* support trt

* fix test
2021-12-01 15:21:55 +08:00
Semyon Bevzyuk bb9b0a98de
[Enhancement]: Added static config and CI tests for OpenVINO. (#218)
* Add openvino_static.

* Add openvino-dev.

* Fix skipping ORT tests in test_mmocr_models.

* Updated docs.

* Fix print.

* Fix

* Fix

* Fix other backends

* Fix is_available

* fix ncnn

* Add constrict for get rewrite output

* add not

* Fix

* fix

* Fix

* Fix

* Improve tests

* Remove rebundant `cuda`

* Prevent None object and rename variable

* Fix multi-line string

* rename get_backend_checker

* Add Troubleshooting to doc.

* Fix postprocessing_masks with empty masks.

* Fix tests

* lint

* Update docs.

Co-authored-by: SingleZombie <singlezombie@163.com>
2021-12-01 14:03:48 +08:00
Yifan Zhou 4fc0e79b4e
[Enhancement]: Refine backend environment check and fix online unit test (#239)
* Fix

* Fix other backends

* Fix is_available

* fix ncnn

* Add constrict for get rewrite output

* add not

* Fix

* fix

* Fix

* Fix

* Improve tests

* Remove rebundant `cuda`

* Prevent None object and rename variable

* Fix multi-line string

* rename get_backend_checker

* Fix tests

* lint

* docstring
2021-12-01 10:19:11 +08:00
q.yao a8abc75065
Add licence head to code (#236) 2021-11-30 15:00:37 +08:00
AllentDan d0bb497b0c
[Fix] fix ncnn apis, add onnx2ncnn unit tests, and rename test_mmseg/test_utils.py to avoid conflicts (#233)
* refactor ncnn convert

* refine docstring

* add onnx2ncnn test

* resolve comments and rename test_utils.py in test_mmseg

Co-authored-by: maningsheng <mnsheng@yeah.net>
2021-11-26 11:43:27 +08:00
Yifan Zhou eab6d76838
Fix test (#234) 2021-11-25 19:41:31 +08:00
VVsssssk 58993ccd63
[Fix]Fix utils test (#232)
* fix apis unit test

* remove tmp file

* delete test/test_mmedit and tests/test_mmseg
 Please enter the commit message for your changes. Lines starting

* fix device to cpu

* fix tests/test_utils

* rename test_util
2021-11-25 19:41:21 +08:00
VVsssssk 8a3e5e0464
【Fix】Fix apis unit test (#231)
* fix apis unit test

* remove tmp file

* delete test/test_mmedit and tests/test_mmseg
 Please enter the commit message for your changes. Lines starting

* fix device to cpu
2021-11-25 18:48:52 +08:00
hanrui1sensetime cab362a248
[Unittest] mmcls fix ut (#228)
* mmcls fix ut

* force add data folder

* remove debug info

* fix ut bugs
2021-11-25 18:48:11 +08:00
AllentDan 8c95bede4c
[Refactor] refactor mmocr unit tests (#227)
* refactor mmocr unit tests

* fix unit tests

* resolve comments
2021-11-25 18:11:24 +08:00
VVsssssk ed70afedcd
[Fix] Fix ops unit test (#225)
* fix tensorrt and onnxrt ops unit test

* fix ncnn unit test
2021-11-25 17:06:08 +08:00
q.yao 3a785f1223
[Refactor] Refactor codebase (#220)
* [WIP] Refactor v2.0 (#163)

* Refactor backend wrapper

* Refactor mmdet.inference

* Fix

* merge

* refactor utils

* Use deployer and deploy_model to manage pipeline

* Resolve comments

* Add a real inference api function

* rename wrappers

* Set execute to private method

* Rename deployer deploy_model

* Refactor task

* remove type hint

* lint

* Resolve comments

* resolve comments

* lint

* docstring

* [Fix]: Fix bugs in details in refactor branch (#192)

* [WIP] Refactor v2.0 (#163)

* Refactor backend wrapper

* Refactor mmdet.inference

* Fix

* merge

* refactor utils

* Use deployer and deploy_model to manage pipeline

* Resolve comments

* Add a real inference api function

* rename wrappers

* Set execute to private method

* Rename deployer deploy_model

* Refactor task

* remove type hint

* lint

* Resolve comments

* resolve comments

* lint

* docstring

* Fix errors

* lint

* resolve comments

* fix bugs

* conflict

* lint and typo

* Resolve comment

* refactor mmseg (#201)

* support mmseg

* fix docstring

* fix docstring

* [Refactor]: Get the count of backend files (#202)

* Fix backend files

* resolve comments

* lint

* Fix ncnn

* [Refactor]: Refactor folders of mmdet (#200)

* Move folders

* lint

* test object detection model

* lint

* reset changes

* fix openvino

* resolve comments

* __init__.py

* Fix path

* [Refactor]: move mmseg (#206)

* [Refactor]: Refactor mmedit (#205)

* feature mmedit

* edit2.0

* edit

* refactor mmedit

* fix __init__.py

* fix __init__

* fix formai

* fix comment

* fix comment

* Fix wrong func_name of ConvFCBBoxHead (#209)

* [Refactor]: Refactor mmdet unit test (#207)

* Move folders

* lint

* test object detection model

* lint

* WIP

* remove print

* finish unit test

* Fix tests

* resolve comments

* Add mask test

* lint

* resolve comments

* Refine cfg file

* Move files

* add files

* Fix path

* [Unittest]: Refine the unit tests in mmdet #214

* [Refactor] refactor mmocr to mmdeploy/codebase (#213)

* refactor mmocr to mmdeploy/codebase

* fix docstring of show_result

* fix docstring of visualize

* refine docstring

* replace print with logging

* refince codes

* resolve comments

* resolve comments

* [Refactor]: mmseg  tests (#210)

* refactor mmseg tests

* rename test_codebase

* update

* add model.py

* fix

* [Refactor] Refactor mmcls and the package (#217)

* refactor mmcls

* fix yapf

* fix isort

* refactor-mmcls-package

* fix print to logging

* fix docstrings according to others comments

* fix comments

* fix comments

* fix allentdans comment in pr215

* remove mmocr init

* [Refactor] Refactor mmedit tests (#212)

* feature mmedit

* edit2.0

* edit

* refactor mmedit

* fix __init__.py

* fix __init__

* fix formai

* fix comment

* fix comment

* buff

* edit test and code refactor

* refactor dir

* refactor tests/mmedit

* fix docstring

* add test coverage

* fix lint

* fix comment

* fix comment

* Update typehint (#216)

* update type hint

* update docstring

* update

* remove file

* fix ppl

* Refine get_predefined_partition_cfg

* fix tensorrt version > 8

* move parse_cuda_device_id to device.py

* Fix cascade

* onnx2ncnn docstring

Co-authored-by: Yifan Zhou <singlezombie@163.com>
Co-authored-by: RunningLeon <maningsheng@sensetime.com>
Co-authored-by: VVsssssk <88368822+VVsssssk@users.noreply.github.com>
Co-authored-by: AllentDan <41138331+AllentDan@users.noreply.github.com>
Co-authored-by: hanrui1sensetime <83800577+hanrui1sensetime@users.noreply.github.com>
2021-11-25 09:57:05 +08:00
AllentDan a4dceb4bb4
[Enhancement] Enhance ppl for all codebases (#177)
* enhance ppl for all codebases

* fix dump info

* fix md and use not None

* remove redundant codes

* safe convert empty ppl tensor

* add examples and remove useless lines
2021-11-16 19:16:46 +08:00
Semyon Bevzyuk 49dd1cf678
[Enhancement]: Support VFNet from MMDetection for OpenVINO and ONNX Runtime. (#195)
* Add deform_conv_openvino.

* Add get_bboxes_of_vfnet_head.

* Fix vfnet and add test_get_bboxes_of_vfnet_head.

* Update docs.

* Fix test_shufflenetv2_backbone__forward for openvino.

* Fixes.
2021-11-16 10:59:59 +08:00
Semyon Bevzyuk c599ed5904
[Enhancement]: Support YOLOX from MMDetection for OpenVINO and ONNX Runtime. (#190)
* Add get_bboxes_of_yolox_head.

* Add test_yolox_head_get_bboxes.

* Update docs.
2021-11-12 10:39:42 +08:00
hanrui1sensetime a35fb3ddd1
[Feature]: Support shufflenet_v2 for NCNN (#183)
* support shufflenet_v2

* fix yapf

* fix lint

* reply comments

* fix docformatter

* reply comment

* fix lint

* fix ut

* fix yapf
2021-11-10 20:14:31 +08:00
VVsssssk c05a839cfe
[FIX]fix with_mask to instance_seg (#181)
* fix with_mask to instance_seg

* fix instance_cfg to instance-cfg
2021-11-09 17:45:05 +08:00
RunningLeon cd51f12f32
[Feature]: Support yolov3 (#167)
* support yolov3 with ort and trt

* add ncnn compare

* fix yolo_head ncnn rewriter

* align perforance with ort trt for yolov3

* update doc

* add test for compare with equal,less, greater

* change namespace

* reformat cpp

* fix lint

* fix lint

* add unit test for yolov3 head

* remove compare op

* update doc

* update table format in docs

* update comments

* update

Co-authored-by: hanrui1sensetime <hanrui1@sensetime.com>
2021-11-08 16:07:58 +08:00
Semyon Bevzyuk ca93007035
[Enhancement]: Support FoveaBox and ATSS from mmdetection for OpenVINO and ONNX Runtime (#160)
* Add FoveaHead and AtssHead.

* Update docs.

* Fix typos and docstrings.

* Fixes.

* Fix img_metas type in docstring.
2021-11-05 17:45:49 +08:00
Semyon Bevzyuk c52b24c67f
[Enhancement]: Added support for masks in OpenVINO. (#148)
* Fix include and lib paths for onnxruntime.

* Fixes for SSD export test

* Add onnx2openvino and OpenVINODetector. Test models: ssd, retinanet, fcos, fsaf.

* Add support for two-stage models: faster_rcnn, cascade_rcnn

* Add doc

* Add strip_doc_string for openvino.

* Fix openvino preprocess.

* Add OpenVINO to test_wrapper.py.

* Fix

* Add openvino_execute.

* Removed preprocessing.

* Fix onnxruntime cmake.

* Rewrote postprocessing and forward, added docstrings and fixes.

* Added device type change to OpenVINOWrapper.

* Update forward_of_single_roi_extractor_dynamic_openvino and fix doc.

* Update docs.

* Add support for masks (Mask RCNN).

* Add masks to CascadeRoIHead.simple_test.

* Added masks to test_OpenVINODetector.

* Added test_cascade_roi_head_with_mask.

* Update docs.

* Fix segm_results shape.

* Fix TopK in NMS and add test_multiclass_nms_with_keep_top_k.

* Removed unnecessary functions.

* Fix.

* Fix test_multiclass_nms_with_keep_top_k.

* Updated test_OpenVINODetector.
2021-11-03 10:27:48 +08:00
Yifan Zhou 227bebaade
[Enhancement]: Rename files in mmdeploy/core/rewriters (#157)
* Rename files

* lint

* update docstring
2021-10-27 15:12:00 +08:00
AllentDan 77131ea071
[Feature] Add exporting SARNet to onnxruntime backends. (#134)
* save codes

* save codes

* support sar exporting to onnxruntime and tensorrt

* use 4G max gpu space

* support sequential sar

* remove trt config for sar

* add sar unit tests

* add sar unit tests

* resolve conflicts

* remove torch.add rewrite in unit tests
2021-10-26 15:42:06 +08:00
Yifan Zhou 398bf2b386
[Refactor]: Refactor mmdeploy/core (#140)
* refactor function rewriter

* Pass unit test

* Fix test

* Fix test

* lint

* refactor function rewriter

* Pass unit test

* Fix test

* Fix test

* lint

* support openvino

* update

1. All type hints of cfg are set to Dict
2. Check if kwargs exist when calling patch_model
3. Complement tests
4. key name 'object' is set to '_object'

* lint

* Update docstring

* Fix tests

* Improve test
2021-10-26 10:30:14 +08:00
AllentDan 35b7341766
fix mmocr (#147) 2021-10-25 19:09:28 +08:00
Semyon Bevzyuk ba7ae81d3e
[Unittest]: Test for CascadeRoIHead (#141)
* Fix include and lib paths for onnxruntime.

* Fixes for SSD export test

* Add onnx2openvino and OpenVINODetector. Test models: ssd, retinanet, fcos, fsaf.

* Add support for two-stage models: faster_rcnn, cascade_rcnn

* Add doc

* Add strip_doc_string for openvino.

* Fix openvino preprocess.

* Add OpenVINO to test_wrapper.py.

* Fix

* Add openvino_execute.

* Removed preprocessing.

* Fix onnxruntime cmake.

* Rewrote postprocessing and forward, added docstrings and fixes.

* Added device type change to OpenVINOWrapper.

* Update forward_of_single_roi_extractor_dynamic_openvino and fix doc.

* Update docs.

* Add OpenVINODetector and onn2openvino tests.

* Add input_info to onnx2openvino.

* Add TestOpenVINOExporter and test_single_roi_extractor.

* Moved get_input_shape_from_cfg to openvino_utils.py and added test.

* Added test_cascade_roi_head.

* Add backend.check_env() to tests.

* Add OpenVINO to get_rewrite_outputs and to some tests in test_mmdet_models.

* Moved test_single_roi_extractor to test_mmdet_models.

* Removed TestOpenVINOExporter.

* Added test_cascade_roi_head.

* Fix onnxruntime outputs type.
2021-10-25 15:13:09 +08:00
hanrui1sensetime 9e227b228b
[UnitTest] mmocr unittest (#130)
* WIP test_mmocr 8 out of 20

* test_mmocr_export

* test mmocr apis

* add test data

* add mmocr model unittest 5 passed 1 failed

* finish mmocr unittest

* fix lint

* fix yapf

* fix isort

* fix flake8

* fix docformatter

* fix docformatter

* try to fix unittest after merge master

* Change test.py for backend.DEFAULT

* fix flake8

* fix ut

* fix yapf

* fix ut build

* fix yapf

* fix mmocr_export ut

* fix mmocr_apis ort not cuda

* remove explicit .forward

* remove backendwrapper

* simplify the crnn and dbnet config

* simplify instance_test.json

* add another case of decoder

* increase coverage of test_mmocr_models base_recognizer

* improve coverage

* improve encode_decoder coverage

* reply for grimoire codereview

* what if not check cuda?

* remove image data

* reply to runningleon code review

* fix fpnc

* fix lint

* try to fix CI UT error

* fix fpnc with and wo custom ops

* fix yapf

* skip fpnc when cuda is not ready in ci

* reply for code review

* reply for code review

* fix yapf

* reply for code review

* fix yapf

* fix conflict

* remove unmatched data path

* remove unnecessary comments
2021-10-25 10:15:57 +08:00
Semyon Bevzyuk c5a87fb1bc
[Enhancement]: OpenVINO deployment support for some models (#117)
* Fix include and lib paths for onnxruntime.

* Fixes for SSD export test

* Add onnx2openvino and OpenVINODetector. Test models: ssd, retinanet, fcos, fsaf.

* Add support for two-stage models: faster_rcnn, cascade_rcnn

* Add doc

* Add strip_doc_string for openvino.

* Fix openvino preprocess.

* Add OpenVINO to test_wrapper.py.

* Fix

* Add openvino_execute.

* Removed preprocessing.

* Fix onnxruntime cmake.

* Rewrote postprocessing and forward, added docstrings and fixes.

* Added device type change to OpenVINOWrapper.

* Update forward_of_single_roi_extractor_dynamic_openvino and fix doc.

* Update docs.

* Add OpenVINODetector and onn2openvino tests.

* Add input_info to onnx2openvino.

* Add TestOpenVINOExporter and test_single_roi_extractor.

* Moved get_input_shape_from_cfg to openvino_utils.py and added test.

* Added test_cascade_roi_head.

* Add backend.check_env() to tests.

* Add OpenVINO to get_rewrite_outputs and to some tests in test_mmdet_models.

* Moved test_single_roi_extractor to test_mmdet_models.

* Removed TestOpenVINOExporter.
2021-10-21 16:07:35 +08:00
Yifan Zhou e240c1569f
[Unittest]: Test mmcls (#135)
* Add tests

* lint

* add data

* Remove redundant code
2021-10-19 20:30:51 +08:00
VVsssssk fd75d57175
[Unittest]: Add MMSegmentation test (#125)
* add ncnn test exporter in test_ops.py

* add ncnn test exporter in utils.py

* add onnxruntime and tensorrt ops test

* fix blank line

* fix comment
add nms ops test

* remove nms test

* add test sample
add dockerstring

* remove nms test

* fix grid_sample
add type hind

* fix problem

* fix dockerstring

* add nms batch_nms multi_level_roi_align

* add test data

* fix problem

* rm pkl file dependent

* rm file

* add docstring

* remove multi_level_dependce

* add mmseg module unittest

* add mmseg test

* add mmseg model unit test

* fix blankline

* rename file

* add syncbn2bn unit test

* add apis/export

* lint

* lint

* ??

* delete#

* fix ncnn check

* fix problems

* fix problems

* fix dim problems

* resolve comments

* Fix SwitchBackendWrapper

* fix assert problems

* fix assert

* Remove comment

* merge master

Co-authored-by: SingleZombie <singlezombie@163.com>
2021-10-19 15:25:06 +08:00
Yifan Zhou 6f36717a72
[Unittest]: Test mmdeploy.pytorch (#133)
* add some tests

* Fix topk bug

* Fix bug in test

* Add remaining tests

* Remvoe debug code

* Delete redundant code

* Remove redundant code
2021-10-19 13:14:33 +08:00
VVsssssk 0f1cda0d3e
[Unittest]Add mmcv unit test (#128)
* add ncnn test exporter in test_ops.py

* add ncnn test exporter in utils.py

* add onnxruntime and tensorrt ops test

* fix blank line

* fix comment
add nms ops test

* remove nms test

* add test sample
add dockerstring

* remove nms test

* fix grid_sample
add type hind

* fix problem

* fix dockerstring

* add nms batch_nms multi_level_roi_align

* add test data

* fix problem

* rm pkl file dependent

* rm file

* add docstring

* remove multi_level_dependce

* add mmseg module unittest

* add mmseg test

* add mmseg model unit test

* fix blankline

* rename file

* add syncbn2bn unit test

* add apis/export

* lint

* lint

* ??

* delete#

* fix ncnn check

* fix problems

* fix problems

* add mmcv unit test

* add mmcv unit test

* modify scores

* fix format

* fix scores to rand

* remove blank line

Co-authored-by: SingleZombie <singlezombie@163.com>
2021-10-19 11:43:35 +08:00
Yifan Zhou 26cf2bdf05
[Enhancement]: Clarify the return value of get_rewrite_outputs (#129)
* Modify function and its call

* fix typo
2021-10-15 16:18:32 +08:00
Yifan Zhou 10c4ef4203
[Unittest]: MMEdit unittest (#124)
* add mmedit test

* Solve unittest bug

* lint

* Remove debug code

* add data

* Refine code

* Fix ci

* Fix ci

* follow changes in mmdet test

* try to remove pytest skip

* remove redundant code

* rename

* Fix type hint

* Fix lint

* Refine SwitchBackendWrapper. Fix type hint

* update docstring
2021-10-15 10:25:48 +08:00
hanrui1sensetime 07cb78bb7c
[Unittest] add ncnn unittest expand and fix expand.cpp bugs. (#118)
* add ncnn unittest expand

* rollback utils.py

* remove figures
2021-10-14 10:24:14 +08:00
AllentDan d4828c7836
[Unittests] MMDet unittests (#112)
* add mmdet unittests

* remove redundant img meta info

* import wrapper from backend util

* force add wrapper

* use smaller nuance

* add seed everything

* add create input part and some inference part unittests

* fix lint

* skip ppl

* remove pyppl

* add dataset files

* import ncnn_ext inside ncnn warpper

* use cpu device to create input

* add pssd and ptsd unittests

* clear mmdet unittests

* wrap function to enable rewrite

* refine codes and resolve comments

* move mmdet inside test func

* remove redundant line

* test visualize in mmdeploy.apis

* use less memory

* resolve comments

* fix ci

* move pytest.skip inside test function and use 3 channel input
2021-10-13 17:24:11 +08:00
hanrui1sensetime 1ed6bc0fb5
refactor ncnn ops unittest (#121) 2021-10-12 14:24:56 +08:00
hanrui1sensetime 21f2b047a1
[Unittest] Test ncnn gather op and fix gather.cpp (#114)
* add shape constantofshape unittest for ncnn

* fix lint

* standarize import

* fix lint

* reply for code review

* reply for code review

* fix lint

* remove some hardcode

* fix lint

* reply for code review

* test gather and fix gather cpp code

* fix yapf

* fix clang-format

* reply for code review

* reply for code review

* fix lint
2021-10-09 14:06:49 +08:00
Yifan Zhou f8a70f1d33
[Unittest]: Complement remaining tests in apis/core/utils (#110)
* Add remaining tests

* Use another method to import

* try to fix ppl import error

* try to fix pyppl import bug 2

* try to fix pyppl import error 3

* try to fix pyppl import error 4

* Use test class

* remove ()

* lint

* add else branch
2021-10-09 14:05:48 +08:00
hanrui1sensetime cba43e4c22
[Unittest] Add NCNN tensorslice unittest and fix tensorslice.cpp bugs. (#115)
* add tensorslice unittest

* reply code review

* fix lint

* fix typo
2021-10-09 11:42:32 +08:00
q.yao f56a30025a
[Enhance] Add spell hook (#116)
* add spell hook

* fix code spell
2021-10-09 11:34:14 +08:00
q.yao a335444a49
[Fix]: Remove TensorRT NMS plugin (#113)
* Remove TensorRT NMS plugin

* remove nms test
2021-10-09 11:14:38 +08:00
VVsssssk 43eee77fdd
[Unittest]Add ops test (#108)
* add ncnn test exporter in test_ops.py

* add ncnn test exporter in utils.py

* add onnxruntime and tensorrt ops test

* fix blank line

* fix comment
add nms ops test

* remove nms test

* add test sample
add dockerstring

* remove nms test

* fix grid_sample
add type hind

* fix problem

* fix dockerstring

* add nms batch_nms multi_level_roi_align

* add test data

* fix problem

* rm pkl file dependent

* rm file

* add docstring

* remove multi_level_dependce

* Update test_ops.py
2021-10-09 10:45:03 +08:00
hanrui1sensetime 6318e9fcf9
[Unittest] Add ncnn 'Shape' 'ConstantOfShape' unittest (#107)
* add shape constantofshape unittest for ncnn

* fix lint

* standarize import

* fix lint

* reply for code review

* reply for code review

* fix lint

* remove some hardcode

* fix lint

* reply for code review
2021-09-29 15:02:58 +08:00
AllentDan 5818095fe0
[Unittests] Add a demo for codebase rewrite part unittests (#89)
* save codes

* add test_model

* save codes

* wrap func

* reformat

* fix lint

* refine docstring

* remove pkl in .gitignore

* add pkl

* apply channel 3

* add function and trt backend rewrite unittest

* fix lint and typo

* add skip condition

* fix typo

* define deploy config inside func and keep ortwrapper original

* speed up and remove ctx

* only inference if no backends

* fix ci

* fix ci

* [Fix] Fix test_calibration (#101)

* fix test calibration

* Modify cuda to cpu

* add tensorrt check

* Revert "[Fix] Fix test_calibration (#101)"

This reverts commit 3f8b8384bfd880538050798d2567f1c137a36174.

Co-authored-by: maningsheng <mnsheng@yeah.net>
Co-authored-by: Yifan Zhou <singlezombie@163.com>
2021-09-28 19:29:58 +08:00
VVsssssk 0bef0513c6
[Unittest]: Add ncnn test exporter and topk test (#84)
* add ncnn test exporter in test_ops.py

* add ncnn test exporter in utils.py

* fix ncnn unittest

* fix lint

* fix lint

* fix lint isort

* remove ncnn roi_align pytest

* add ncnn topk unittest

* update to new api

* fix lint

* add comments

* skip class

* skip ncnn

Co-authored-by: hanrui1sensetime <hanrui1@sensetime.com>
Co-authored-by: maningsheng <mnsheng@yeah.net>
2021-09-28 14:20:04 +08:00
Yifan Zhou 2073f3327e
[Fix] Fix test_calibration (#101)
* fix test calibration

* Modify cuda to cpu
2021-09-27 19:51:07 +08:00
RunningLeon 6ba1d45e81
[Fix]: fix ignoring test_ops (#102)
* show message from pytest skip

* skip utility class

Co-authored-by: SingleZombie <singlezombie@163.com>
2021-09-27 19:10:18 +08:00
RunningLeon f9b2cab3fa
[Feature]: Update github CI (#100)
* align mmedit static cfg

* add for test

* update requirments

* add dependencies from mmlab

* change name

* lower thresh for interrogate at first

* update test

* update to skip

* Move import tensorrt

* Move import statement

Co-authored-by: SingleZombie <singlezombie@163.com>
2021-09-27 17:43:41 +08:00
Yifan Zhou 4de5bbb461
[Unittest]: Add demos for core/apis/utils (#91)
* add unittests

* lint

* modify .gitignore, remove useless files

* remove emtpy.py and generate it when use

* Update according to comments

1. Use tempfile
2. Delete inference test (which will be tested in each codebase)
3. Refine calibration test

* update annotation

* Add export_info

* Reduce data scale, fix assert

* update json blank line

* add backend check
2021-09-27 16:10:47 +08:00
VVsssssk b6c16d01db
[Unittest]: Add onnxruntime and tensorrt ops unit test (#96)
* add ncnn test exporter in test_ops.py

* add ncnn test exporter in utils.py

* add onnxruntime and tensorrt ops test

* fix blank line

* fix comment
add nms ops test

* remove nms test

* add test sample
add dockerstring

* remove nms test

* fix grid_sample
add type hind

* fix problem

* fix dockerstring
2021-09-27 11:16:23 +08:00
hanrui1sensetime 01e2240b94
[Fix] Fix RoiAlign Unittest (#90)
* fix roi_align unittest

* fix lint

* remove non must code

* fix isort

* reply for review

* fix lint

* reply code review

* fix docformatter

* fix review

* reuse mmcv.roialignfunction
2021-09-26 11:21:18 +08:00
AllentDan ec66d47057
[Feature] Add speed test components (#86)
* add time counter

* add time-count to all backends

* fix lint

* add docstring and unit tests

* use test instead

* remove enable member

* refinement

* replace runtime error with assert and log speed with a single line

* fix unit tests

* resolve comments and add file output

* remove an argument
2021-09-22 19:42:16 +08:00
VVsssssk 00bfbf8e89
Test ops (#48)
* test_ops_v1

* test_ops_version1.0

* test_ops_version1.1

* test_ops_version1.1

* test_ops_version1.1

* test_ops1.1

* test_ops2.0

* test_ops2.1

* test_ops2.1

* test_ops2.1

* test_ops2.1

* test_ops2.2

* test_ops2.2

* test_ops2.3

* test_ops2.3

* test_ops2.3

* test_ops2.3

* test_2.4

* test_ops2.4
2021-09-08 13:42:15 +08:00