merge master and resolve conflicts #561

lvhan028 · 2022-06-07T11:12:27Z

Thanks for your contribution and we appreciate it a lot. The following instructions would make your pull request more healthy and more easily receiving feedbacks. If you do not understand some items, don't worry, just make the pull request and seek help from maintainers.

Motivation

Please describe the motivation of this PR and the goal you want to achieve through this PR.

Modification

Please briefly describe what modification is made in this PR.

BC-breaking (Optional)

Does the modification introduce changes that break the backward-compatibility of the downstream repositories?
If so, please describe how it breaks the compatibility and how the downstream projects should modify their code to keep compatibility with this PR.

Use cases (Optional)

If this PR introduces a new feature, it is better to list some use cases here, and update the documentation.

Checklist

Pre-commit or other linting tools are used to fix the potential lint issues.
The modification is covered by complete unit tests. If not, please add more unit tests to ensure the correctness.
If the modification has a dependency on downstream projects of a newer version, this PR should be tested with all supported versions of downstream projects.
The documentation has been modified accordingly, like docstring or example tutorials.

* add postprocessing_masks gpu version * default device cpu * pre-commit fix Co-authored-by: hadoop-basecv <hadoop-basecv@set-gh-basecv-serving-classify11.mt>

…es list is passed (open-mmlab#310)

* fix formatter * relax GCC version requirement

* fix show * lint * remove redundant codes * resolve comment * type hint

* docs(build): add missing build option * docs(build): add onnx install * style(doc): trim whitespace * docs(build): revert install onnx * docs(build): add ncnn LD_LIBRARY_PATH * docs(build): fix path error

* fix wrong input mat type * fix lint

* upload doc * add images * resolve comments * update translation

* fix ncnn docs` * update 0216

* add CUDA_TOOKIT_ROOT_DIR as tensorrt detect dir * Update FindTENSORRT.cmake

…on (open-mmlab#363) * fix wrong buffer which will case onnxruntime-gpu crash with segmentaion * fix check * fix build error * remove unused header

…ss sdk predict. (open-mmlab#407)

* fix feature test for `std::source_location` * suppress msvc warnings * fix consistency

* fix seg name * use default name Co-authored-by: dongchunyu.vendor <dongchunyu@pjlab.org.cn>

* add ipynb file * rename file * add open in colab tag * fix lint and add img show * fix open in colab link * fix comments * fix pre-commit config

* fix mmpose api * use fmt::format instead * fix potential nullptr access

* support formatting `PixelFormat` & `DataType` * format enum for legacy spdlog * fix format

open-mmlab#479) * If a cuda launch error occurs, verify if cuda device requires top_k to be reduced. * Fixed lint * Clang format * Fixed lint, clang-format

* optional default value * resolve comments Co-authored-by: dongchunyu.vendor <dongchunyu@pjlab.org.cn>

* Update: Optimize document - Minor fixes in styling and grammar - Add support for Jetson Xavier NX (Tested and worked) - Add hardware recommendation - Change JetPack installation guide URL from jp5.0 to jp4.6.1 - Add a note to select "Jetson SDK Components" when using NVIDIA SDK Manager - Change PyTorch wheel save location - Add more dependencies needed for torchvision installation. Otherwise installation error - Simplify torchvision git cloning branch - Add installation times for torchvision, MMCV, versioned-hdf5, ppl.cv, model converter, SDK libraries - Delete "snap" from cmake removal as "apt-get purge" is enough - Add a note on which scenarios you need to append cu da path and libraries to PATH and LD_LIBRARY_PATH - Simplify MMCV git cloning branch - Delete "skip if you don't need MMDeploy C/C++ Inference SDK", because that is the only available inference SDK at the moment - Add more details to object detection demo using C/C++ Inference SDK such as installing MMDetection and converting a model - Add image of inference result - Delete "set env for pip" in troubleshooting because this is already mentioned under "installing Archiconda" Signed-off-by: Lakshantha Dissanayake <lakshanthad@seeed.cc> * Fix: note style on doc * Fix: Trim trailing whitespaces * Update: add source image before inference

A typo prevents nms from onnxizing correctly if batch size is static and greater than 1.

* Fix doc common * Fix bugs

* Add tutorial04 * lint * add image * resolve comment

* fix mmseg twich resize * remove comment

* align mask output to cpu device * align ncnn ssd output to torch.Tensor type * --amend

…en-mmlab#482) * update doc * refine expression * cn doc

* tutorial 05 * Upload image * resolve comments * resolve comment

* fix pspnet torchscript conversion * resolve comment * add IR to rewrite

* changing the onnxwrapper script * gpu_issue * Update wrapper.py * Update wrapper.py * Update runtime.txt * Update runtime.txt * Update wrapper.py

RunningLeon

LGTM

tpoisonooo · 2022-06-08T04:15:17Z

按质量理论，每一步没问题，merge 成一个大的应该也没问题。

LGTM。

This reverts commit 916c25e.

irexyc and others added 30 commits April 2, 2022 22:35

fix pose demo and windows build (open-mmlab#307)

7cfe6e6

add postprocessing_masks gpu version (open-mmlab#276)

442e9cd

* add postprocessing_masks gpu version * default device cpu * pre-commit fix Co-authored-by: hadoop-basecv <hadoop-basecv@set-gh-basecv-serving-classify11.mt>

fixed a bug causes text-recognizer to fail when (non-NULL) empty bbox…

85c46ee

…es list is passed (open-mmlab#310)

[Fix] include missing <type_traits> for formatter.h (open-mmlab#313)

6e7e219

* fix formatter * relax GCC version requirement

[Fix] MMEditing cannot save results when testing (open-mmlab#336)

d7adf81

* fix show * lint * remove redundant codes * resolve comment * type hint

docs(build): fix typo (open-mmlab#352)

89ce8e2

* docs(build): add missing build option * docs(build): add onnx install * style(doc): trim whitespace * docs(build): revert install onnx * docs(build): add ncnn LD_LIBRARY_PATH * docs(build): fix path error

fix openvino export tmp model, add binary flag (open-mmlab#353)

6aacede

init circleci (open-mmlab#348)

ade8e02

fix wrong input mat type (open-mmlab#362)

fdbd3d1

* fix wrong input mat type * fix lint

fix(docs): remove redundant doc tree (open-mmlab#360)

88062e9

fix missing ncnn_DIR & InferenceEngine_DIR (open-mmlab#364)

b9c5487

Fix mmdet openvino dynamic 300x300 cfg base (open-mmlab#372)

a8c75de

Fix: add onnxruntime building option in gpu dockerfile (open-mmlab#366)

957fd58

Tutorial 03: torch2onnx (open-mmlab#365)

9dad97e

* upload doc * add images * resolve comments * update translation

[Docs] fix ncnn docs (open-mmlab#378)

85f1778

* fix ncnn docs` * update 0216

typo-fix (open-mmlab#397)

f9144f7

add CUDA_TOOKIT_ROOT_DIR as tensorrt detect dir (open-mmlab#357)

ee26593

* add CUDA_TOOKIT_ROOT_DIR as tensorrt detect dir * Update FindTENSORRT.cmake

Fix docs (open-mmlab#398)

f6fcee5

ort_net ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL (open-mmlab#383)

53ad86d

fix wrong buffer which will case onnxruntime-gpu crash with segmentai…

d9976c4

…on (open-mmlab#363) * fix wrong buffer which will case onnxruntime-gpu crash with segmentaion * fix check * fix build error * remove unused header

fix benchmark (open-mmlab#411)

9560348

Add sm_53 in cuda.cmake for Jetson Nano which will cashe when proce…

8e6d4de

…ss sdk predict. (open-mmlab#407)

[Fix] fix feature test for std::source_location (open-mmlab#416)

cecd1ec

* fix feature test for `std::source_location` * suppress msvc warnings * fix consistency

fix format string (open-mmlab#417)

72c19e9

[Fix] Fix seg name (open-mmlab#394)

a9a4144

* fix seg name * use default name Co-authored-by: dongchunyu.vendor <dongchunyu@pjlab.org.cn>

【Docs】Add ipython notebook tutorial (open-mmlab#234)

21230d5

* add ipynb file * rename file * add open in colab tag * fix lint and add img show * fix open in colab link * fix comments * fix pre-commit config

fix mmpose api (open-mmlab#396)

8aba06d

* fix mmpose api * use fmt::format instead * fix potential nullptr access

[Fix] support latest spdlog (open-mmlab#423)

16ee9c7

* support formatting `PixelFormat` & `DataType` * format enum for legacy spdlog * fix format

fix pillarencode (open-mmlab#331)

86ab063

fix ONNXRuntime cuda test bug (open-mmlab#438)

5231e65

tehkillerbee and others added 16 commits May 17, 2022 19:55

If a cuda launch error occurs, verify if cuda device requires top_k t… (

2f2ec27

open-mmlab#479) * If a cuda launch error occurs, verify if cuda device requires top_k to be reduced. * Fixed lint * Clang format * Fixed lint, clang-format

[Fix] set optional arg a default value (open-mmlab#483)

ba641c3

* optional default value * resolve comments Co-authored-by: dongchunyu.vendor <dongchunyu@pjlab.org.cn>

fix: bbox_nms not onnxizing if batch size > 1 (open-mmlab#501)

e057b87

A typo prevents nms from onnxizing correctly if batch size is static and greater than 1.

change seperator of function marker (open-mmlab#499)

a4de9f3

[docs] Fix typo in tutorial (open-mmlab#509)

57baf21

Fix docstring format (open-mmlab#495)

de3f18f

* Fix doc common * Fix bugs

Tutorial 04: onnx custom op (open-mmlab#508)

d16720b

* Add tutorial04 * lint * add image * resolve comment

fix mmseg twice resize (open-mmlab#480)

4f49763

* fix mmseg twich resize * remove comment

Fix mask test with mismatched device (open-mmlab#511)

0878b8f

* align mask output to cpu device * align ncnn ssd output to torch.Tensor type * --amend

compat mmpose v0.26 (open-mmlab#518)

32482e7

[Docs] adding new backends when using MMDeploy as a third package (op…

571b240

…en-mmlab#482) * update doc * refine expression * cn doc

Tutorial 05: ONNX Model Editing (open-mmlab#517)

6fa1787

* tutorial 05 * Upload image * resolve comments * resolve comment

fix pspnet torchscript conversion (open-mmlab#538)

182cc51

* fix pspnet torchscript conversion * resolve comment * add IR to rewrite

changing the onnxwrapper script for gpu issue (open-mmlab#532)

2a0fcb6

* changing the onnxwrapper script * gpu_issue * Update wrapper.py * Update wrapper.py * Update runtime.txt * Update runtime.txt * Update wrapper.py

merge master and fix the conflicts

594c835

lvhan028 requested review from RunningLeon, AllentDan, grimoire, hanrui1sensetime, irexyc, lzhangzz and tpoisonooo June 7, 2022 11:21

RunningLeon approved these changes Jun 8, 2022

View reviewed changes

tpoisonooo approved these changes Jun 8, 2022

View reviewed changes

lvhan028 merged commit 916c25e into open-mmlab:dev-v0.5.0 Jun 8, 2022

lvhan028 added a commit that referenced this pull request Jun 8, 2022

Revert "merge master and resolve conflicts (#561)"

4320e07

This reverts commit 916c25e.

lvhan028 mentioned this pull request Jun 8, 2022

Revert "merge master and resolve conflicts" #568

Closed

lvhan028 deleted the dev-v0.5.0 branch July 19, 2022 08:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge master and resolve conflicts #561

merge master and resolve conflicts #561

lvhan028 commented Jun 7, 2022

RunningLeon left a comment

tpoisonooo commented Jun 8, 2022

merge master and resolve conflicts #561

merge master and resolve conflicts #561

Conversation

lvhan028 commented Jun 7, 2022

Motivation

Modification

BC-breaking (Optional)

Use cases (Optional)

Checklist

RunningLeon left a comment

Choose a reason for hiding this comment

tpoisonooo commented Jun 8, 2022