Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master and resolve conflicts #561

Merged
merged 52 commits into from
Jun 8, 2022

Conversation

lvhan028
Copy link
Collaborator

@lvhan028 lvhan028 commented Jun 7, 2022

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

  1. Pre-commit or other linting tools are used to fix the potential lint issues.
  2. The modification is covered by complete unit tests. If not, please add more unit tests to ensure the correctness.
  3. 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.
  4. The documentation has been modified accordingly, like docstring or example tutorials.

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

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* add postprocessing_masks gpu version

* default device cpu

* pre-commit fix

Co-authored-by: hadoop-basecv <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…es list is passed (open-mmlab#310)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix formatter

* relax GCC version requirement

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix show

* lint

* remove redundant codes

* resolve comment

* type hint

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* 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

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix wrong input mat type

* fix lint

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* upload doc

* add images

* resolve comments

* update translation

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix ncnn docs`

* update 0216

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* add CUDA_TOOKIT_ROOT_DIR as tensorrt detect dir

* Update FindTENSORRT.cmake

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…on (open-mmlab#363)

* fix wrong buffer which will case onnxruntime-gpu crash with segmentaion

* fix check

* fix build error

* remove unused header

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…ss sdk predict. (open-mmlab#407)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix feature test for `std::source_location`

* suppress msvc warnings

* fix consistency

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix seg name

* use default name

Co-authored-by: dongchunyu.vendor <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* 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

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix mmpose api

* use fmt::format instead

* fix potential nullptr access

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* support formatting `PixelFormat` & `DataType`

* format enum for legacy spdlog

* fix format

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
tehkillerbee and others added 16 commits May 17, 2022 19:55

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
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

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* optional default value

* resolve comments

Co-authored-by: dongchunyu.vendor <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* 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 <[email protected]>

* Fix: note style on doc

* Fix: Trim trailing whitespaces

* Update: add source image before inference

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
A typo prevents nms from onnxizing correctly if batch size is static and greater than 1.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* Fix doc common

* Fix bugs

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* Add tutorial04

* lint

* add image

* resolve comment

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix mmseg twich resize

* remove comment

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* align mask output to cpu device

* align ncnn ssd output to torch.Tensor type

* --amend

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…en-mmlab#482)

* update doc

* refine expression

* cn doc

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* tutorial 05

* Upload image

* resolve comments

* resolve comment

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* fix pspnet torchscript conversion

* resolve comment

* add IR to rewrite

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* changing the onnxwrapper script

* gpu_issue

* Update wrapper.py

* Update wrapper.py

* Update runtime.txt

* Update runtime.txt

* Update wrapper.py
Copy link
Collaborator

@RunningLeon RunningLeon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tpoisonooo
Copy link
Collaborator

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

LGTM。

@lvhan028 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
@lvhan028 lvhan028 deleted the dev-v0.5.0 branch July 19, 2022 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet