diff --git a/.github/ISSUE_TEMPLATE/1_bug-report.yml b/.github/ISSUE_TEMPLATE/1_bug-report.yml index 07cd50b3935..4bad99ede4b 100644 --- a/.github/ISSUE_TEMPLATE/1_bug-report.yml +++ b/.github/ISSUE_TEMPLATE/1_bug-report.yml @@ -9,6 +9,17 @@ body: If you have already identified the reason, we strongly appreciate you creating a new PR according to [the tutorial](https://mmclassification.readthedocs.io/en/master/community/CONTRIBUTING.html)! If you need our help, please fill in the following form to help us to identify the bug. + - type: dropdown + id: version + attributes: + label: Branch + description: Which branch/version are you using? + options: + - master branch (0.24 or other 0.x version) + - 1.x branch (1.0.0rc2 or other 1.x version) + validations: + required: true + - type: textarea id: describe validations: diff --git a/.github/ISSUE_TEMPLATE/2_feature-request.yml b/.github/ISSUE_TEMPLATE/2_feature-request.yml index de468131cbe..314205865a1 100644 --- a/.github/ISSUE_TEMPLATE/2_feature-request.yml +++ b/.github/ISSUE_TEMPLATE/2_feature-request.yml @@ -8,6 +8,17 @@ body: value: | If you have already implemented the feature, we strongly appreciate you creating a new PR according to [the tutorial](https://mmclassification.readthedocs.io/en/master/community/CONTRIBUTING.html)! + - type: dropdown + id: version + attributes: + label: Branch + description: Which branch/version are you using? + options: + - master branch (0.24 or other 0.x version) + - 1.x branch (1.0.0rc2 or other 1.x version) + validations: + required: true + - type: textarea id: describe validations: diff --git a/.github/ISSUE_TEMPLATE/4_bug-report_zh.yml b/.github/ISSUE_TEMPLATE/3_bug-report_zh.yml similarity index 86% rename from .github/ISSUE_TEMPLATE/4_bug-report_zh.yml rename to .github/ISSUE_TEMPLATE/3_bug-report_zh.yml index de6e2bc6c8f..d04735f7bb0 100644 --- a/.github/ISSUE_TEMPLATE/4_bug-report_zh.yml +++ b/.github/ISSUE_TEMPLATE/3_bug-report_zh.yml @@ -11,6 +11,17 @@ body: 如果你已经有了解决方案，我们非常欢迎你直接创建一个新的 PR 来解决这个问题。创建 PR 的流程可以参考[文档](https://mmclassification.readthedocs.io/zh_CN/master/community/CONTRIBUTING.html)。 如果你需要我们的帮助，请填写以下内容帮助我们定位 Bug。 + - type: dropdown + id: version + attributes: + label: 分支 + description: 你正在使用的分支/版本是哪个？ + options: + - master 分支 (0.24 或其他 0.x 版本) + - 1.x 分支 (1.0.0rc2 或其他 1.x 版本) + validations: + required: true + - type: textarea id: describe validations: diff --git a/.github/ISSUE_TEMPLATE/3_general-questions.yml b/.github/ISSUE_TEMPLATE/3_general-questions.yml deleted file mode 100644 index 664d8a74024..00000000000 --- a/.github/ISSUE_TEMPLATE/3_general-questions.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 💬 General questions -description: Ask general questions to get help -labels: ["help wanted"] - -body: - - type: checkboxes - id: prerequisite - attributes: - label: Prerequisite - options: - - label: I have searched related issues but cannot get the expected help. - required: true - - label: I have read [the documentation](https://mmclassification.readthedocs.io/) and don't know what to do. - required: true - - - type: textarea - id: describe - validations: - required: true - attributes: - label: Describe the question - placeholder: | - 1. I have read the documentation but I still don't know how to use the functionality xxx. - 2. Other questions. diff --git a/.github/ISSUE_TEMPLATE/5_feature-request_zh.yml b/.github/ISSUE_TEMPLATE/4_feature-request_zh.yml similarity index 80% rename from .github/ISSUE_TEMPLATE/5_feature-request_zh.yml rename to .github/ISSUE_TEMPLATE/4_feature-request_zh.yml index 60467a6d85b..639315df274 100644 --- a/.github/ISSUE_TEMPLATE/5_feature-request_zh.yml +++ b/.github/ISSUE_TEMPLATE/4_feature-request_zh.yml @@ -10,6 +10,17 @@ body: 如果你已经实现了该功能，我们非常欢迎你直接创建一个新的 PR 来解决这个问题。创建 PR 的流程可以参考[文档](https://mmclassification.readthedocs.io/zh_CN/master/community/CONTRIBUTING.html)。 + - type: dropdown + id: version + attributes: + label: 分支 + description: 你正在使用的分支/版本是哪个？ + options: + - master 分支 (0.24 或其他 0.x 版本) + - 1.x 分支 (1.0.0rc2 或其他 1.x 版本) + validations: + required: true + - type: textarea id: describe validations: diff --git a/.github/ISSUE_TEMPLATE/6_general-questions_zh.yml b/.github/ISSUE_TEMPLATE/6_general-questions_zh.yml deleted file mode 100644 index 520bde22fce..00000000000 --- a/.github/ISSUE_TEMPLATE/6_general-questions_zh.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: 💬 寻求帮助 -description: 其他类型的问题需要帮助 -labels: ["help wanted"] - -body: - - type: markdown - attributes: - value: | - 推荐使用英语模板 General question，以便你的问题帮助更多人。 - - - type: checkboxes - id: prerequisite - attributes: - label: 我已试图查询该问题 - options: - - label: 我已经查阅了相关 issue，没有找到相关帮助。 - required: true - - label: 我已经查询了[官方文档](https://mmclassification.readthedocs.io/zh_CN/master/)，没有找到相关帮助。 - required: true - - - type: textarea - id: describe - validations: - required: true - attributes: - label: 描述该问题 - placeholder: | - 1. 我阅读了文档，仍不清楚如何使用 xxx 功能。 - 2. 其他问题 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8d519f2436d..24e0d0af4e3 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,12 +1,12 @@ blank_issues_enabled: false contact_links: - - name: 📚 MMClassification Documentation + - name: 📚 MMClassification Documentation (官方文档) url: https://mmclassification.readthedocs.io/en/latest/ about: Check if your question is answered in docs - - name: 💬 Forum + - name: 💬 General questions (寻求帮助) url: https://github.com/open-mmlab/mmclassification/discussions about: Ask general usage questions and discuss with other MMClassification community members - - name: 🌐 Explore OpenMMLab + - name: 🌐 Explore OpenMMLab (官网) url: https://openmmlab.com/ about: Get know more about OpenMMLab diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 062bd9295ad..54ea4d7c783 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,24 +29,18 @@ concurrency: cancel-in-progress: true jobs: - build_without_timm: + build_with_timm: runs-on: ubuntu-latest env: UBUNTU_VERSION: ubuntu1804 strategy: matrix: python-version: [3.6] - torch: [1.5.0, 1.8.0, 1.9.0] + torch: [1.8.0] include: - - torch: 1.5.0 - torchvision: 0.6.0 - torch_major: 1.5.0 - torch: 1.8.0 torchvision: 0.9.0 torch_major: 1.8.0 - - torch: 1.9.0 - torchvision: 0.10.0 - torch_major: 1.9.0 steps: - uses: actions/checkout@v2 @@ -63,13 +57,26 @@ jobs: - name: Install mmcls dependencies run: | pip install -r requirements.txt + - name: Install timm + run: | + pip install timm - name: Build and install run: | rm -rf .eggs pip install -e . -U - name: Run unittests run: | - pytest tests/ --ignore tests/test_models/test_backbones/test_timm_backbone.py + coverage run --branch --source mmcls -m pytest tests/ + coverage xml + coverage report -m --omit="mmcls/utils/*","mmcls/apis/*" + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v2 + with: + file: ./coverage.xml + flags: unittests + env_vars: OS,PYTHON + name: codecov-umbrella + fail_ci_if_error: false build: runs-on: ubuntu-latest @@ -130,16 +137,13 @@ jobs: - name: Install mmcls dependencies run: | pip install -r requirements.txt - - name: Install timm - run: | - pip install timm - name: Build and install run: | rm -rf .eggs pip install -e . -U - name: Run unittests and generate coverage report run: | - coverage run --branch --source mmcls -m pytest tests/ + coverage run --branch --source mmcls -m pytest tests/ -k "not timm" coverage xml coverage report -m --omit="mmcls/utils/*","mmcls/apis/*" - name: Upload coverage to Codecov