Bump version to 1.0.0rc1

open-mmlab · Oct 9, 2022 · f30c16c · f30c16c
2 parents c44b611 + daa676d
commit f30c16c
Show file tree

Hide file tree

Showing 139 changed files with 3,862 additions and 4,340 deletions.
diff --git a/.circleci/scripts/get_mmcv_var.sh b/.circleci/scripts/get_mmcv_var.sh
diff --git a/.circleci/test.yml b/.circleci/test.yml
@@ -36,8 +36,6 @@ jobs:
         type: string
       torchvision:
         type: string
-      mmcv:
-        type: string
     docker:
       - image: cimg/python:<< parameters.python >>
     resource_class: large
@@ -51,30 +49,31 @@ jobs:
       - run:
           name: Configure Python & pip
           command: |
-            python -m pip install --upgrade pip
-            python -m pip install wheel
+            pip install --upgrade pip
+            pip install wheel
       - run:
           name: Install PyTorch
           command: |
             python -V
-            python -m pip install torch==<< parameters.torch >>+cpu torchvision==<< parameters.torchvision >>+cpu -f https://download.pytorch.org/whl/torch_stable.html
+            pip install torch==<< parameters.torch >>+cpu torchvision==<< parameters.torchvision >>+cpu -f https://download.pytorch.org/whl/torch_stable.html
       - run:
           name: Install mmocr dependencies
           command: |
-            python -m pip install git+ssh://[email protected]/open-mmlab/mmengine.git@main
-            python -m pip install << parameters.mmcv >>
-            python -m pip install git+ssh://[email protected]/open-mmlab/[email protected]
-            python -m pip install -r requirements.txt
+            pip install git+https://github.com/open-mmlab/mmengine.git@main
+            pip install -U openmim
+            mim install 'mmcv >= 2.0.0rc1'
+            pip install git+https://github.com/open-mmlab/[email protected]
+            pip install -r requirements/tests.txt
       - run:
           name: Build and install
           command: |
-            python -m pip install -e .
+            pip install -e .
       - run:
           name: Run unittests
           command: |
-            python -m coverage run --branch --source mmocr -m pytest tests/
-            python -m coverage xml
-            python -m coverage report -m
+            coverage run --branch --source mmocr -m pytest tests/
+            coverage xml
+            coverage report -m
   build_cuda:
     parameters:
       torch:
@@ -85,8 +84,6 @@ jobs:
       cudnn:
         type: integer
         default: 7
-      mmcv:
-        type: string
     machine:
       image: ubuntu-2004-cuda-11.4:202110-01
       # docker_layer_caching: true
@@ -97,8 +94,8 @@ jobs:
           # Cloning repos in VM since Docker doesn't have access to the private key
           name: Clone Repos
           command: |
-            git clone -b main --depth 1 ssh://git@github.com/open-mmlab/mmengine.git /home/circleci/mmengine
-            git clone -b dev-3.x --depth 1 ssh://git@github.com/open-mmlab/mmdetection.git /home/circleci/mmdetection
+            git clone -b main --depth 1 https://github.com/open-mmlab/mmengine.git /home/circleci/mmengine
+            git clone -b dev-3.x --depth 1 https://github.com/open-mmlab/mmdetection.git /home/circleci/mmdetection
       - run:
           name: Build Docker image
           command: |
@@ -108,17 +105,19 @@ jobs:
           name: Install mmocr dependencies
           command: |
             docker exec mmocr pip install -e /mmengine
-            docker exec mmocr pip install << parameters.mmcv >>
+            docker exec mmocr pip install -U openmim
+            docker exec mmocr mim install 'mmcv >= 2.0.0rc1'
             docker exec mmocr pip install -e /mmdetection
-            docker exec mmocr pip install -r requirements.txt
+            docker exec mmocr pip install -r requirements/tests.txt
       - run:
           name: Build and install
           command: |
             docker exec mmocr pip install -e .
       - run:
           name: Run unittests
           command: |
-            docker exec mmocr python -m pytest tests/
+            docker exec mmocr pytest tests/
+
 workflows:
   pr_stage_lint:
     when: << pipeline.parameters.lint_only >>
@@ -129,7 +128,7 @@ workflows:
             branches:
               ignore:
                 - dev-1.x
-                - test-1.x
+                - 1.x
   pr_stage_test:
     when:
       not:
@@ -142,42 +141,18 @@ workflows:
               ignore:
                 - dev-1.x
                 - test-1.x
-  merge_stage_test:
-    when:
-      not:
-        << pipeline.parameters.lint_only >>
-    jobs:
-      - build_cuda:
-          name: minimum_version_gpu
-          torch: 1.6.0
-          # Use double quotation mark to explicitly specify its type
-          # as string instead of number
-          mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cu101/torch1.6.0/mmcv_full-2.0.0rc0-cp37-cp37m-manylinux1_x86_64.whl
-          cuda: "10.1"
-          filters:
-            branches:
-              only:
-                - dev-1.x
-                - test-1.x
       - build_cpu:
           name: minimum_version_cpu
           torch: 1.6.0
           torchvision: 0.7.0
           python: 3.6.9  # The lowest python 3.6.x version available on CircleCI images
-          mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cpu/torch1.6.0/mmcv_full-2.0.0rc0-cp36-cp36m-manylinux1_x86_64.whl
-          # requires:
-          #   - lint
-          filters:
-            branches:
-              only:
-                - dev-1.x
-                - test-1.x
+          requires:
+            - lint
       - build_cpu:
           name: maximum_version_cpu
-          torch: 1.9.0
-          torchvision: 0.10.0
+          torch: 1.12.1
+          torchvision: 0.13.1
           python: 3.9.0
-          mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cpu/torch1.9.0/mmcv_full-2.0.0rc0-cp39-cp39-manylinux1_x86_64.whl
           requires:
             - minimum_version_cpu
       - hold:
@@ -190,6 +165,20 @@ workflows:
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
           cuda: "10.2"
-          mmcv: https://download.openmmlab.com/mmcv/dev-2.x/cu102/torch1.8.0/mmcv_full-2.0.0rc0-cp37-cp37m-manylinux1_x86_64.whl
           requires:
             - hold
+  merge_stage_test:
+    when:
+      not:
+        << pipeline.parameters.lint_only >>
+    jobs:
+      - build_cuda:
+          name: minimum_version_gpu
+          torch: 1.6.0
+          # Use double quotation mark to explicitly specify its type
+          # as string instead of number
+          cuda: "10.1"
+          filters:
+            branches:
+              only:
+                - dev-1.x
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,22 +6,22 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-# jobs:
-#   lint:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v2
-#       - name: Set up Python 3.7
-#         uses: actions/setup-python@v2
-#         with:
-#           python-version: 3.7
-#       - name: Install pre-commit hook
-#         run: |
-#           pip install pre-commit
-#           pre-commit install
-#       - name: Linting
-#         run: pre-commit run --all-files
-#       - name: Check docstring coverage
-#         run: |
-#           pip install interrogate
-#           interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-regex "__repr__" --fail-under 50 mmocr
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install pre-commit hook
+        run: |
+          pip install pre-commit
+          pre-commit install
+      - name: Linting
+        run: pre-commit run --all-files
+      - name: Check docstring coverage
+        run: |
+          pip install interrogate
+          interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-regex "__repr__" --fail-under 90 mmocr