merge dev-1.x into main

open-mmlab · Jul 6, 2023 · f2637ee · f2637ee
2 parents c331b65 + 56c18a2
commit f2637ee
Show file tree

Hide file tree

Showing 354 changed files with 27,093 additions and 4,613 deletions.
diff --git a/.circleci/docker/Dockerfile b/.circleci/docker/Dockerfile
@@ -1,6 +1,6 @@
 ARG PYTORCH="1.8.1"
-ARG CUDA="10.2"
-ARG CUDNN="7"
+ARG CUDA="11.1"
+ARG CUDNN="8"
 
 FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel
 

diff --git a/.circleci/test.yml b/.circleci/test.yml
@@ -64,19 +64,14 @@ jobs:
             pip install git+ssh://[email protected]/open-mmlab/mmengine.git@main
             pip install -U openmim
             mim install 'mmcv >= 2.0.0'
-            pip install git+ssh://[email protected]/open-mmlab/[email protected]
+            pip install git+https://[email protected]/open-mmlab/[email protected]
             pip install git+https://github.com/open-mmlab/[email protected]
+            pip install git+https://github.com/open-mmlab/[email protected]
             pip install -r requirements.txt
-      - when:
-          condition:
-            equal: [ "1.13.0", << parameters.torch >> ]
-          steps:
-            - run: pip install timm
-      - when:
-          condition:
-            equal: [ "1.6.0", << parameters.torch >> ]
-          steps:
-            - run: pip install timm==0.6.7
+      - run:
+          name: Install timm
+          command: |
+            pip install timm
       - when:
           condition:
             equal: [ "0.10.0", << parameters.torchvision >> ]
@@ -98,7 +93,7 @@ jobs:
         type: string
       cuda:
         type: enum
-        enum: ["11.0"]
+        enum: ["11.1"]
       cudnn:
         type: integer
         default: 8
@@ -129,6 +124,7 @@ jobs:
             docker exec mmaction pip install -U openmim
             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://[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
       - run:
@@ -141,7 +137,6 @@ jobs:
             docker exec mmaction pytest tests/
 workflows:
   pr_stage_lint:
-    when: << pipeline.parameters.lint_only >>
     jobs:
       - lint:
           name: lint
@@ -164,8 +159,8 @@ workflows:
                 - main
       - build_cpu:
           name: minimum_version_cpu
-          torch: 1.6.0
-          torchvision: 0.7.0
+          torch: 1.8.1
+          torchvision: 0.9.1
           python: 3.7.4
           requires:
             - lint
@@ -185,7 +180,7 @@ workflows:
           torch: 1.8.1
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
-          cuda: "11.0"
+          cuda: "11.1"
           requires:
             - hold
   merge_stage_test:
@@ -195,10 +190,10 @@ workflows:
     jobs:
       - build_cuda:
           name: minimum_version_gpu
-          torch: 1.7.1
+          torch: 1.8.1
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
-          cuda: "11.0"
+          cuda: "11.1"
           filters:
             branches:
               only:

diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml
@@ -60,6 +60,8 @@ jobs:
         run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install MMCls
         run: pip install git+https://github.com/open-mmlab/[email protected]
+      - name: Install MMPose
+        run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install PytorchVideo
         run: pip install pytorchvideo
         if: ${{matrix.torchvision == '0.10.0'}}
@@ -78,12 +80,8 @@ 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]
+        torch: [1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.1]
         include:
-          - torch: 1.6.0
-            torchvision: 0.7.0
-          - torch: 1.7.1
-            torchvision: 0.8.2
           - torch: 1.8.1
             torchvision: 0.9.1
           - torch: 1.9.1
@@ -108,12 +106,8 @@ jobs:
         run: pip install librosa soundfile
       - name: Install lmdb
         run: pip install lmdb
-      - name: Install timm
-        run: pip install timm==0.6.7
-        if: ${{matrix.torch == '1.6.0'}}
       - name: Install timm
         run: pip install timm
-        if: ${{matrix.torch != '1.6.0'}}
       - name: Install TurboJpeg lib
         run: sudo apt-get install -y libturbojpeg
       - name: Install PyTorch
@@ -128,6 +122,8 @@ jobs:
         run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install MMCls
         run: pip install git+https://github.com/open-mmlab/[email protected]
+      - name: Install MMPose
+        run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install unittest dependencies
         run: pip install -r requirements.txt
       - name: Install PytorchVideo
@@ -190,6 +186,7 @@ jobs:
           mim install 'mmcv >= 2.0.0'
           pip install git+https://github.com/open-mmlab/[email protected]
           pip install git+https://github.com/open-mmlab/[email protected]
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements.txt
       - name: Install PytorchVideo
         run: pip install pytorchvideo
@@ -214,7 +211,10 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - name: Upgrade pip
-        run: pip install pip --upgrade
+        run: |
+            python -V
+            python -m pip install pip --upgrade
+            python -m pip install wheel
       - name: Install librosa and soundfile
         run: python -m pip install librosa soundfile
       - name: Install lmdb
@@ -228,14 +228,15 @@ jobs:
           mim install 'mmcv >= 2.0.0'
           pip install git+https://github.com/open-mmlab/[email protected]
           pip install git+https://github.com/open-mmlab/[email protected]
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements.txt
       - name: Install PytorchVideo
         run: python -m pip install pytorchvideo
       - name: Install timm
         run: python -m pip install timm
       - name: Build and install
         run: |
-          pip install -e .
+          pip install -e . -v
       - name: Run unittests and generate coverage report
         run: |
           pytest tests/
diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml
@@ -30,7 +30,7 @@ jobs:
         with:
            python-version: ${{ matrix.python-version }}
       - name: Upgrade pip
-        run: pip install pip --upgrade  && pip install wheel
+        run: pip install pip --upgrade && pip install wheel
       - name: Install soundfile lib
         run: sudo apt-get install -y libsndfile1
       - name: Install librosa and soundfile
@@ -51,6 +51,8 @@ jobs:
         run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install MMCls
         run: pip install git+https://github.com/open-mmlab/[email protected]
+      - name: Install MMPose
+        run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install unittest dependencies
         run: pip install -r requirements.txt
       - name: Install PytorchVideo
@@ -95,7 +97,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Upgrade pip
-        run: pip install pip --upgrade  && pip install wheel
+        run: pip install pip --upgrade && pip install wheel
       - name: Fetch GPG keys
         run: |
           apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
@@ -117,6 +119,7 @@ jobs:
           mim install 'mmcv >= 2.0.0'
           pip install git+https://github.com/open-mmlab/[email protected]
           pip install git+https://github.com/open-mmlab/[email protected]
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements.txt
       - name: Install PytorchVideo
         run: pip install pytorchvideo
@@ -165,6 +168,7 @@ jobs:
           mim install 'mmcv >= 2.0.0'
           pip install git+https://github.com/open-mmlab/[email protected]
           pip install git+https://github.com/open-mmlab/[email protected]
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements.txt
       - name: Install PytorchVideo
         run: python -m pip install pytorchvideo

diff --git a/.gitignore b/.gitignore
@@ -64,8 +64,16 @@ instance/
 # Scrapy stuff:
 .scrapy
 
-# Sphinx documentation
+# Auto generate documentation
 docs/*/_build/
+docs/*/model_zoo/
+docs/*/dataset_zoo/
+docs/*/_model_zoo.rst
+docs/*/modelzoo_statistics.md
+docs/*/datasetzoo_statistics.md
+docs/*/projectzoo.md
+docs/*/papers/
+docs/*/api/generated/
 
 # PyBuilder
 target/
@@ -133,11 +141,11 @@ work_dirs/
 !tests/data/**/*.pth
 
 # avoid soft links created by MIM
-mmaction/configs/*
 mmaction/tools/*
 
 *.ipynb
 
 # unignore ipython notebook files in demo
 !demo/*.ipynb
+!projects/stad_tutorial/*.ipynb
 mmaction/.mim
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -34,7 +34,7 @@ repos:
     rev: v2.1.0
     hooks:
       - id: codespell
-        args: ["--skip", "*.ipynb", "-L", "Gool,tread,gool,mot"]
+        args: ["--skip", "*.ipynb", "-L", "ECT,Gool,tread,gool,mot"]
   - repo: https://github.com/executablebooks/mdformat
     rev: 0.7.14
     hooks:

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.7"
+    python: "3.9"
 
 formats:
     - epub

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
 include mmaction/.mim/model-index.yml
+include mmaction/.mim/dataset-index.yml
 recursive-include mmaction/.mim/configs *.py *.yml
 recursive-include mmaction/.mim/tools *.sh *.py