Merge pull request #2346 from open-mmlab/dev-1.x

merge dev-1.x to main

.circleci/test.yml

@@ -44,7 +44,6 @@ jobs:
       - run:
           name: Install Libraries
           command: |
-            sudo add-apt-repository ppa:savoury1/ffmpeg4
             sudo apt-get update
             sudo apt-get upgrade
             sudo apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libturbojpeg pkg-config
@@ -64,7 +63,7 @@ jobs:
           command: |
             pip install git+ssh://[email protected]/open-mmlab/mmengine.git@main
             pip install -U openmim
-            mim install 'mmcv >= 2.0.0rc1'
+            mim install 'mmcv >= 2.0.0'
             pip install git+ssh://[email protected]/open-mmlab/[email protected]
             pip install git+https://github.com/open-mmlab/[email protected]
             pip install -r requirements.txt
@@ -99,10 +98,10 @@ jobs:
         type: string
       cuda:
         type: enum
-        enum: ["10.1", "10.2", "11.1"]
+        enum: ["11.0"]
       cudnn:
         type: integer
-        default: 7
+        default: 8
     machine:
       image: ubuntu-2004-cuda-11.4:202110-01
       # docker_layer_caching: true
@@ -115,33 +114,24 @@ jobs:
             docker build .circleci/docker -t mmaction:gpu --build-arg PYTORCH=<< parameters.torch >> --build-arg CUDA=<< parameters.cuda >> --build-arg CUDNN=<< parameters.cudnn >>
             docker run --gpus all -t -d -v /home/circleci/project:/mmaction -w /mmaction --name mmaction mmaction:gpu
             docker exec mmaction apt-get update
+            docker exec mmaction pip install "numpy==1.23"
             docker exec mmaction apt-get upgrade -y
             docker exec mmaction apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libturbojpeg pkg-config
             docker exec mmaction apt-get install -y libavdevice-dev libavfilter-dev libopus-dev libvpx-dev libsrtp2-dev libsndfile1
+      - run:
+          name: Install PytorchVideo and timm
+          command: |
+            docker exec mmaction pip install timm
+            docker exec mmaction python -m pip install pytorchvideo
       - run:
           name: Install mmaction dependencies
           command: |
             docker exec mmaction pip install git+https://[email protected]/open-mmlab/mmengine.git@main
             docker exec mmaction pip install -U openmim
-            docker exec mmaction mim install 'mmcv >= 2.0.0rc1'
+            docker exec mmaction mim install 'mmcv >= 2.0.0'
             docker exec mmaction pip install git+https://[email protected]/open-mmlab/[email protected]
             docker exec mmaction pip install git+https://github.com/open-mmlab/[email protected]
             docker exec mmaction pip install -r requirements.txt
-      - when:
-          condition:
-            equal: [ "1.8.1", << parameters.torch >> ]
-          steps:
-            - run: docker exec mmaction pip install timm
-      - when:
-          condition:
-            equal: [ "1.6.0", << parameters.torch >> ]
-          steps:
-            - run: docker exec mmaction pip install timm==0.6.7
-      - when:
-          condition:
-            equal: [ "10.2", << parameters.cuda >> ]
-          steps:
-            - run: docker exec mmaction python -m pip install pytorchvideo
       - run:
           name: Build and install
           command: |
@@ -160,7 +150,7 @@ workflows:
             branches:
               ignore:
                 - dev-1.x
-                - 1.x
+                - main
   pr_stage_test:
     when:
       not:
@@ -172,7 +162,7 @@ workflows:
             branches:
               ignore:
                 - dev-1.x
-                - 1.x
+                - main
       - build_cpu:
           name: minimum_version_cpu
           torch: 1.6.0
@@ -196,7 +186,7 @@ workflows:
           torch: 1.8.1
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
-          cuda: "10.2"
+          cuda: "11.0"
           requires:
             - hold
   merge_stage_test:
@@ -206,11 +196,12 @@ workflows:
     jobs:
       - build_cuda:
           name: minimum_version_gpu
-          torch: 1.6.0
+          torch: 1.7.1
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
-          cuda: "10.1"
+          cuda: "11.0"
           filters:
             branches:
               only:
                 - dev-1.x
+                - main

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -0,0 +1,100 @@
+name: "🐞 Bug Report"
+description: "Create a report to help us reproduce and fix the bug"
+labels: Bug
+title: "[Bug] "
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If you have already identified the reason, we strongly appreciate you creating a new PR to fix it [here](https://github.com/open-mmlab/mmaction2/pulls)!
+        If this issue is about installing MMCV, please file an issue at [MMCV](https://github.com/open-mmlab/mmcv/issues/new/choose).
+        If you need our help, please fill in as much of the following form as you're able.
+
+        **The less clear the description, the longer it will take to solve it.**
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Branch
+      description: Which branch/version are you using?
+      options:
+        - master branch (0.x version, such as `v0.10.0`, or `dev` branch)
+        - 1.x branch (1.x version, such as `v1.0.0rc2`, or `dev-1.x` branch)
+    validations:
+      required: true
+
+  - 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/mmaction2/issues) and [Discussions](https://github.com/open-mmlab/mmaction2/discussions) but cannot get the expected help.
+        required: true
+      - label: I have read the [documentation](https://mmaction2.readthedocs.io/en/latest/) but cannot get the expected help.
+        required: true
+      - label: The bug has not been fixed in the [latest version](https://github.com/open-mmlab/mmaction2).
+        required: true
+
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        Please run `python mmaction2/utils/collect_env.py` to collect necessary environment information and copy-paste it here.
+        You may add additional information that may be helpful for locating the problem, such as
+          - How you installed PyTorch \[e.g., pip, conda, source\]
+          - Other environment variables that may be related (such as `$PATH`, `$LD_LIBRARY_PATH`, `$PYTHONPATH`, etc.)
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: |
+        Please provide a clear and concise description of what the bug is.
+        Preferably a simple and minimal code snippet is provided below, so that we can reproduce the error by running the code.
+      placeholder: |
+        A clear and concise description of what the bug is.
+
+  - 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.
+        Did you make any modifications on the code or config? Are you clear about what you have modified?
+      placeholder: |
+        ```python
+        # Sample code to reproduce the problem
+        ```
+
+  - 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.
+        ```
+
+  - type: textarea
+    attributes:
+      label: Reproduces the problem - error message
+      description: |
+        Please provide the error message or logs you got, with the full traceback.
+      placeholder: |
+        ```
+        The error message or logs you got, with the full traceback.
+        ```
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: Tell us anything else you think we should know.
+      placeholder: |
+        1. What's your expected result?
+        2. What dataset did you use?
+        3. What do you think might be the reason?

.github/ISSUE_TEMPLATE/2-feature-request.yml

@@ -0,0 +1,33 @@
+name: 🚀 Feature Request
+description: Suggest an idea for this project
+labels: [Feature]
+title: "[Feature] "
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We strongly appreciate you creating a PR to implete this feature [here](https://github.com/open-mmlab/mmaction2/pulls)!
+        If you need our help, please fill in as much of the following form as you're able.
+
+        **The less clear the description, the longer it will take to solve it.**
+
+  - type: textarea
+    attributes:
+      label: What is the problem this feature will solve?
+      placeholder: |
+        E.g., It is inconvenient when \[....\].
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What is the feature?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What alternatives have you considered?
+      description: |
+        Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/3-documentation.yml

@@ -0,0 +1,23 @@
+name: 📚 Documentation Issue
+description: Report an issue related to https://mmaction2.readthedocs.io/en/latest/.
+labels: "Documentation"
+title: "[Docs] "
+
+body:
+- type: textarea
+  attributes:
+    label: The doc issue
+    description: >
+      A clear and concise description of what content in https://mmaction2.readthedocs.io/en/latest/ is an issue.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Suggest a potential alternative/fix
+    description: >
+      Tell us how we could improve the documentation in this regard.
+- type: markdown
+  attributes:
+    value: >
+      Thanks for contributing 🎉!

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,12 @@
 blank_issues_enabled: false
 
 contact_links:
-  - name: Common Issues
-    url: https://mmaction2.readthedocs.io/en/latest/faq.html
-    about: Check if your issue already has solutions
-  - name: MMAction2 Documentation
-    url: https://mmaction2.readthedocs.io/en/latest/
+  - name: 📚 MMAction2 Documentation (官方文档)
+    url: https://mmaction2.readthedocs.io/en/latest
     about: Check if your question is answered in docs
+  - name: 💬 Forum (寻求帮助)
+    url: https://github.com/open-mmlab/mmaction2/discussions
+    about: Ask general usage questions and discuss with other MMAction2 community members
+  - name: 🌐 Explore OpenMMLab (官网)
+    url: https://openmmlab.com/
+    about: Get know more about OpenMMLab