diff --git a/.circleci/test.yml b/.circleci/test.yml index 534ba7fa4e..7e2f892cbf 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -62,7 +62,7 @@ jobs: pip install -U numpy pip install git+https://github.com/open-mmlab/mmengine.git@main pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x pip install -r requirements/tests.txt pip install -r requirements/albu.txt @@ -111,7 +111,7 @@ jobs: docker exec mmpose pip install -U numpy docker exec mmpose pip install -e /mmengine docker exec mmpose pip install -U openmim - docker exec mmpose mim install 'mmcv >= 2.0.0rc1' + docker exec mmpose mim install 'mmcv >= 2.0.0' docker exec mmpose pip install -e /mmdetection docker exec mmpose pip install -r requirements/tests.txt docker exec mmpose pip install -r requirements/albu.txt diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml new file mode 100644 index 0000000000..23427231b8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/1-bug-report.yml @@ -0,0 +1,93 @@ +name: "🐞 Bug report" +description: "Create a report to help us reproduce and fix the bug" +labels: bug +title: "[Bug] " + +body: + - type: markdown + attributes: + value: | + ## Note + For general usage questions or idea discussions, please post it to our [**Forum**](https://github.com/open-mmlab/mmpose/discussions) + Please fill in as **much** of the following form as you're able to. **The clearer the description, the shorter it will take to solve it.** + + - type: checkboxes + attributes: + label: Prerequisite + description: Please check the following items before creating a new issue. + options: + + - label: I have searched [Issues](https://github.com/open-mmlab/mmpose/issues) and [Discussions](https://github.com/open-mmlab/mmpose/discussions) but cannot get the expected help. + required: true + - label: The bug has not been fixed in the latest version(https://github.com/open-mmlab/mmpose). + required: true + + - type: textarea + attributes: + label: Environment + description: | + Please run following commands and and copy-paste it here: + - `python -c "from mmpose.utils import collect_env; print(collect_env())"` to collect necessary environment information. + - `pip list | grep mm` to collect repositories related to OpenMMLab. + - \[Optional\] Other environment variables that may be related (such as `$PATH`, `$LD_LIBRARY_PATH`, `$PYTHONPATH`, etc.) + validations: + required: true + + - type: textarea + attributes: + label: Reproduces the problem - code sample + description: | + Please provide a code sample that reproduces the problem you ran into. It can be a Colab link or just a code snippet. + placeholder: | + ```python + # Sample code to reproduce the problem + ``` + validations: + required: true + + - type: textarea + attributes: + label: Reproduces the problem - command or script + description: | + What command or script did you run? + placeholder: | + ```shell + The command or script you run. + ``` + validations: + required: true + + - type: textarea + attributes: + label: Reproduces the problem - error message + description: | + Please provide the error message or logs you got, with the full traceback. + + Tip: You can attach screenshots or log files by dragging them into the text area.. + placeholder: | + ``` + The error message or logs you got, with the full traceback. + ``` + validations: + required: true + + - type: textarea + attributes: + label: Additional information + description: | + Tell us anything else you think we should know. + + Tip: You can attach screenshots or log files by dragging them into the text area. + placeholder: | + 1. What's your expected result? + 2. What dataset did you use? + 3. What do you think might be the reason? + + - type: markdown + attributes: + value: | + ## Acknowledgement + Thanks for taking the time to fill out this report. + + If you have already identified the reason, we strongly appreciate you creating a new PR to fix it [**Here**](https://github.com/open-mmlab/mmpose/pulls)! + Please refer to [**Contribution Guide**](https://mmpose.readthedocs.io/en/latest/contribution_guide.html) for contributing. diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.yml b/.github/ISSUE_TEMPLATE/2-feature_request.yml new file mode 100644 index 0000000000..47247a0e17 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/2-feature_request.yml @@ -0,0 +1,37 @@ +name: 🚀 Feature request +description: Suggest an idea for this project +labels: feature-request +title: "[Feature] " + +body: + - type: markdown + attributes: + value: | + ## Note + For general usage questions or idea discussions, please post it to our [**Forum**](https://github.com/open-mmlab/mmpose/discussions) + + Please fill in as **much** of the following form as you're able to. **The clearer the description, the shorter it will take to solve it.** + + - type: textarea + attributes: + label: What is the feature? + description: Tell us more about the feature and how this feature can help. + placeholder: | + E.g., It is inconvenient when \[....\]. + validations: + required: true + + - type: textarea + attributes: + label: Any other context? + description: | + Have you considered any alternative solutions or features? If so, what are they? Also, feel free to add any other context or screenshots about the feature request here. + + - type: markdown + attributes: + value: | + ## Acknowledgement + Thanks for taking the time to fill out this report. + + We strongly appreciate you creating a new PR to implement it [**Here**](https://github.com/open-mmlab/mmpose/pulls)! + Please refer to [**Contribution Guide**](https://mmpose.readthedocs.io/en/latest/contribution_guide.html) for contributing. diff --git a/.github/ISSUE_TEMPLATE/general_questions.md b/.github/ISSUE_TEMPLATE/3-general_questions.yml similarity index 92% rename from .github/ISSUE_TEMPLATE/general_questions.md rename to .github/ISSUE_TEMPLATE/3-general_questions.yml index f02dd63a80..0b1194dc2e 100644 --- a/.github/ISSUE_TEMPLATE/general_questions.md +++ b/.github/ISSUE_TEMPLATE/3-general_questions.yml @@ -1,7 +1,5 @@ ---- name: General questions about: Ask general questions to get help title: '' labels: '' assignees: '' ---- diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md deleted file mode 100644 index 2f9c005993..0000000000 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ /dev/null @@ -1,96 +0,0 @@ -name: "🐞 Bug report" -description: "Create a report to help us reproduce and fix the bug" -labels: bug -title: "\[Bug\] " - -body: - -- type: markdown - attributes: - value: | - \## Note - For general usage questions or idea discussions, please post it to our [**Forum**](https://github.com/open-mmlab/mmpose/discussions) - Please fill in as **much** of the following form as you're able to. **The clearer the description, the shorter it will take to solve it.** - -- type: checkboxes - attributes: - label: Prerequisite - description: Please check the following items before creating a new issue. - options: - - - label: I have searched [Issues](https://github.com/open-mmlab/mmpose/issues) and [Discussions](https://github.com/open-mmlab/mmpose/discussions) but cannot get the expected help. - required: true - - label: The bug has not been fixed in the latest version(https://github.com/open-mmlab/mmpose). - required: true - -- type: textarea - attributes: - label: Environment - description: | - Please run following commands and and copy-paste it here: - \- `python -c "from mmpose.utils import collect_env; print(collect_env())"` to collect necessary environment information. - \- `pip list | grep mm` to collect repositories related to OpenMMLab. - \- \[Optional\] Other environment variables that may be related (such as `$PATH`, `$LD_LIBRARY_PATH`, `$PYTHONPATH`, etc.) - validations: - required: true - -- type: textarea - attributes: - label: Reproduces the problem - code sample - description: | - Please provide a code sample that reproduces the problem you ran into. It can be a Colab link or just a code snippet. - placeholder: | - `python # Sample code to reproduce the problem ` - validations: - required: true - -- type: textarea - attributes: - label: Reproduces the problem - command or script - description: | - What command or script did you run? - placeholder: | - `shell The command or script you run. ` - validations: - required: true - -- type: textarea - attributes: - label: Reproduces the problem - error message - description: | - Please provide the error message or logs you got, with the full traceback. - - ``` - Tip: You can attach screenshots or log files by dragging them into the text area.. - ``` - - placeholder: | - ` The error message or logs you got, with the full traceback. ` - validations: - required: true - -- type: textarea - attributes: - label: Additional information - description: | - Tell us anything else you think we should know. - - ``` - Tip: You can attach screenshots or log files by dragging them into the text area. - ``` - - placeholder: | - 1\. What's your expected result? - 2\. What dataset did you use? - 3\. What do you think might be the reason? - -- type: markdown - attributes: - value: | - \## Acknowledgement - Thanks for taking the time to fill out this report. - - ``` - If you have already identified the reason, we strongly appreciate you creating a new PR to fix it [**Here**](https://github.com/open-mmlab/mmpose/pulls)! - Please refer to [**Contribution Guide**](https://mmpose.readthedocs.io/en/latest/contribution_guide.html) for contributing. - ``` diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index ca94a6f1de..0000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,42 +0,0 @@ -name: 🚀 Feature request -description: Suggest an idea for this project -labels: \[feature-request\] -title: "\[Feature\] " - -body: - -- type: markdown - attributes: - value: | - \## Note - For general usage questions or idea discussions, please post it to our [**Forum**](https://github.com/open-mmlab/mmpose/discussions) - - ``` - Please fill in as **much** of the following form as you're able to. **The clearer the description, the shorter it will take to solve it.** - ``` - -- type: textarea - attributes: - label: What is the feature? - description: Tell us more about the feature and how this feature can help. - placeholder: | - E.g., It is inconvenient when \[....\]. - validations: - required: true - -- type: textarea - attributes: - label: Any other context? - description: | - Have you considered any alternative solutions or features? If so, what are they? Also, feel free to add any other context or screenshots about the feature request here. - -- type: markdown - attributes: - value: | - \## Acknowledgement - Thanks for taking the time to fill out this report. - - ``` - We strongly appreciate you creating a new PR to implement it [**Here**](https://github.com/open-mmlab/mmpose/pulls)! - Please refer to [**Contribution Guide**](https://mmpose.readthedocs.io/en/latest/contribution_guide.html) for contributing. - ``` diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index d2a64590ae..bb60ad40fa 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -43,7 +43,7 @@ jobs: - name: Install MMCV run: | pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' - name: Install MMDet run: | python -m pip install --upgrade pip setuptools wheel @@ -67,12 +67,10 @@ jobs: strategy: matrix: python-version: [3.7] - torch: [1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.1, 1.13.0] + torch: [1.8.0, 1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.1, 1.13.0] include: - - torch: 1.6.0 - torchvision: 0.7.0 - - torch: 1.7.1 - torchvision: 0.8.2 + - torch: 1.8.0 + torchvision: 0.9.0 - torch: 1.8.1 torchvision: 0.9.1 - torch: 1.9.1 @@ -105,7 +103,7 @@ jobs: - name: Install MMCV run: | pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' - name: Install MMDet run: | python -m pip install --upgrade pip setuptools wheel @@ -167,7 +165,7 @@ jobs: pip install -U numpy pip install git+https://github.com/open-mmlab/mmengine.git@main pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x pip install -r requirements/tests.txt pip install -r requirements/runtime.txt @@ -212,7 +210,7 @@ jobs: python -m pip install -U numpy python -m pip install git+https://github.com/open-mmlab/mmengine.git@main python -m pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' python -m pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x python -m pip install -r requirements/tests.txt python -m pip install -r requirements/runtime.txt diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index c5f99b0ebd..5ed6fc8ae7 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -41,7 +41,7 @@ jobs: pip install -U numpy pip install git+https://github.com/open-mmlab/mmengine.git@main pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x pip install -r requirements/tests.txt pip install -r requirements/runtime.txt @@ -95,7 +95,7 @@ jobs: pip install -U numpy pip install git+https://github.com/open-mmlab/mmengine.git@main pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x pip install -r requirements/tests.txt pip install -r requirements/runtime.txt @@ -135,7 +135,7 @@ jobs: pip install -U numpy pip install git+https://github.com/open-mmlab/mmengine.git@main pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x pip install -r requirements/tests.txt pip install -r requirements/runtime.txt @@ -180,7 +180,7 @@ jobs: python -m pip install -U numpy python -m pip install git+https://github.com/open-mmlab/mmengine.git@main python -m pip install -U openmim - mim install 'mmcv >= 2.0.0rc1' + mim install 'mmcv >= 2.0.0' python -m pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x python -m pip install -r requirements/tests.txt python -m pip install -r requirements/albu.txt diff --git a/README.md b/README.md index 34f9caacda..951c4adf2e 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ English | [简体中文](README_CN.md) MMPose is an open-source toolbox for pose estimation based on PyTorch. It is a part of the [OpenMMLab project](https://github.com/open-mmlab). -The master branch works with **PyTorch 1.6+**. +The master branch works with **PyTorch 1.8+**. https://user-images.githubusercontent.com/15977946/124654387-0fd3c500-ded1-11eb-84f6-24eeddbf4d91.mp4 diff --git a/README_CN.md b/README_CN.md index 1b8121767d..49a956cab9 100644 --- a/README_CN.md +++ b/README_CN.md @@ -62,7 +62,7 @@ MMPose 是一款基于 PyTorch 的姿态分析的开源工具箱，是 [OpenMMLab](https://github.com/open-mmlab) 项目的成员之一。 -主分支代码目前支持 **PyTorch 1.6 以上**的版本。 +主分支代码目前支持 **PyTorch 1.8 以上**的版本。 https://user-images.githubusercontent.com/15977946/124654387-0fd3c500-ded1-11eb-84f6-24eeddbf4d91.mp4 diff --git a/demo/MMPose_Tutorial.ipynb b/demo/MMPose_Tutorial.ipynb index 1866a38aa8..1fa381c3f8 100644 --- a/demo/MMPose_Tutorial.ipynb +++ b/demo/MMPose_Tutorial.ipynb @@ -299,8 +299,8 @@ "# install MMEngine, MMCV and MMDetection using MIM\n", "%pip install -U openmim\n", "!mim install mmengine\n", - "!mim install \"mmcv>=2.0.0rc1\"\n", - "!mim install \"mmdet>=3.0.0rc0\"" + "!mim install \"mmcv>=2.0.0\"\n", + "!mim install \"mmdet>=3.0.0\"" ] }, { diff --git a/docker/Dockerfile b/docker/Dockerfile index 347af89ca8..064b803979 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,7 +22,7 @@ RUN pip install xtcocotools # Install MMEngine and MMCV RUN pip install openmim -RUN mim install mmengine "mmcv>=2.0.0rc1" +RUN mim install mmengine "mmcv>=2.0.0" # Install MMPose RUN conda clean --all diff --git a/docs/en/faq.md b/docs/en/faq.md index 40676cbb67..b3efa69255 100644 --- a/docs/en/faq.md +++ b/docs/en/faq.md @@ -14,6 +14,7 @@ Compatible MMPose and MMCV versions are shown as below. Please choose the correc | MMPose version | MMCV/MMEngine version | | :------------: | :-----------------------------: | +| 1.0.0 | mmcv>=2.0.0, mmengine>=0.7.0 | | 1.0.0rc1 | mmcv>=2.0.0rc4, mmengine>=0.6.0 | | 1.0.0rc0 | mmcv>=2.0.0rc0, mmengine>=0.0.1 | | 1.0.0b0 | mmcv>=2.0.0rc0, mmengine>=0.0.1 | @@ -22,7 +23,7 @@ Compatible MMPose and MMCV versions are shown as below. Please choose the correc | MMPose version | MMCV version | | :------------: | :-----------------------: | -| master | mmcv-full>=1.3.8, \<1.8.0 | +| 0.x | mmcv-full>=1.3.8, \<1.8.0 | | 0.29.0 | mmcv-full>=1.3.8, \<1.7.0 | | 0.28.1 | mmcv-full>=1.3.8, \<1.7.0 | | 0.28.0 | mmcv-full>=1.3.8, \<1.6.0 | diff --git a/docs/en/installation.md b/docs/en/installation.md index dc4a0ab386..7285982059 100644 --- a/docs/en/installation.md +++ b/docs/en/installation.md @@ -220,7 +220,7 @@ Note that within Jupyter, the exclamation mark `!` is used to call external exec We provide a [Dockerfile](https://github.com/open-mmlab/mmpose/blob/master/docker/Dockerfile) to build an image. Ensure that your [docker version](https://docs.docker.com/engine/install/) >=19.03. ```shell -# build an image with PyTorch 1.6.0, CUDA 10.1, CUDNN 7. +# build an image with PyTorch 1.8.0, CUDA 10.1, CUDNN 7. # If you prefer other versions, just modified the Dockerfile docker build -t mmpose docker/ ``` diff --git a/docs/zh_cn/faq.md b/docs/zh_cn/faq.md index 15e3fbb98d..ea929b9f91 100644 --- a/docs/zh_cn/faq.md +++ b/docs/zh_cn/faq.md @@ -14,6 +14,7 @@ Compatible MMPose and MMCV versions are shown as below. Please choose the correc | MMPose version | MMCV/MMEngine version | | :------------: | :-----------------------------: | +| 1.0.0 | mmcv>=2.0.0, mmengine>=0.7.0 | | 1.0.0rc1 | mmcv>=2.0.0rc4, mmengine>=0.6.0 | | 1.0.0rc0 | mmcv>=2.0.0rc0, mmengine>=0.0.1 | | 1.0.0b0 | mmcv>=2.0.0rc0, mmengine>=0.0.1 | @@ -22,7 +23,7 @@ Compatible MMPose and MMCV versions are shown as below. Please choose the correc | MMPose version | MMCV version | | :------------: | :-----------------------: | -| master | mmcv-full>=1.3.8, \<1.8.0 | +| 0.x | mmcv-full>=1.3.8, \<1.8.0 | | 0.29.0 | mmcv-full>=1.3.8, \<1.7.0 | | 0.28.1 | mmcv-full>=1.3.8, \<1.7.0 | | 0.28.0 | mmcv-full>=1.3.8, \<1.6.0 | diff --git a/docs/zh_cn/installation.md b/docs/zh_cn/installation.md index 1ec42fe78a..3e9a709e9e 100644 --- a/docs/zh_cn/installation.md +++ b/docs/zh_cn/installation.md @@ -227,7 +227,7 @@ MMPose 提供 [Dockerfile](https://github.com/open-mmlab/mmpose/blob/master/dock 用于构建镜像。请确保您的 [Docker 版本](https://docs.docker.com/engine/install/) >=19.03。 ```shell -# 构建默认的 PyTorch 1.6.0，CUDA 10.1 版本镜像 +# 构建默认的 PyTorch 1.8.0，CUDA 10.1 版本镜像 # 如果您希望使用其他版本，请修改 Dockerfile docker build -t mmpose docker/ ``` diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index fb0519c072..24be7462fc 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1,3 +1,3 @@ -mmcv>=2.0.0rc1,<2.1.0 -mmdet>=3.0.0rc6,<3.1.0 +mmcv>=2.0.0,<2.1.0 +mmdet>=3.0.0,<3.1.0 mmengine>=0.4.0,<1.0.0 diff --git a/tools/misc/publish_model.py b/tools/misc/publish_model.py index 4a8338fdbd..addf4cca64 100644 --- a/tools/misc/publish_model.py +++ b/tools/misc/publish_model.py @@ -41,7 +41,7 @@ def process_checkpoint(in_file, out_file, save_keys=['meta', 'state_dict']): # if it is necessary to remove some sensitive data in checkpoint['meta'], # add the code here. - if digit_version(TORCH_VERSION) >= digit_version('1.6.0'): + if digit_version(TORCH_VERSION) >= digit_version('1.8.0'): torch.save(checkpoint, out_file, _use_new_zipfile_serialization=False) else: torch.save(checkpoint, out_file)