diff --git a/.circleci/config.yml b/.circleci/config.yml index f64c5a3d..cd19ca4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ workflows: tools/.* lint_only false configs/.* lint_only false .circleci/.* lint_only false - base-revision: dev-1.x + base-revision: main # this is the path of the configuration we should trigger once # path filtering and pipeline parameter value updates are # complete. In this case, we are using the parent dynamic diff --git a/.circleci/test.yml b/.circleci/test.yml index c04bf5a0..fcd73983 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -61,7 +61,7 @@ jobs: command: | pip install -U openmim mim install mmengine - mim install 'mmcv==2.0.0rc4' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -91,12 +91,6 @@ jobs: resource_class: gpu.nvidia.small steps: - checkout - - run: - # CLoning repos in VM since Docker doesn't have access to the private key - name: Clone Repos - command: | - git clone -b main --depth 1 https://github.com/open-mmlab/mmengine.git /home/circleci/mmengine - git clone -b dev-1.x --depth 1 https://github.com/open-mmlab/mmclassification.git /home/circleci/mmclassification - run: name: Build Docker image command: | @@ -105,9 +99,9 @@ jobs: - run: name: Install MMSelfSup dependencies command: | - docker exec mmselfsup pip install -e /mmengine docker exec mmselfsup pip install -U openmim - docker exec mmselfsup mim install 'mmcv==2.0.0rc4' + docker exec mmselfsup mim install mmengine + docker exec mmselfsup mim install 'mmcv>=2.0.0' docker exec mmselfsup mim install 'mmdet>=3.0.0rc0' docker exec mmselfsup mim install 'mmsegmentation>=1.0.0rc0' docker exec mmselfsup pip install -r requirements/tests.txt @@ -129,8 +123,7 @@ workflows: filters: branches: ignore: - - dev-1.x - - 1.x + - main pr_stage_test: when: not: @@ -141,7 +134,7 @@ workflows: filters: branches: ignore: - - dev-1.x + - main - build_cpu: name: maximum_version_cpu torch: 2.0.0 @@ -175,10 +168,10 @@ workflows: jobs: - build_cuda: name: minimum_version_gpu - torch: 1.6.0 + torch: 1.8.1 # Use double quotation mark to explicitly specify its type # as string instead of number - cuda: "10.1" + cuda: "10.2" filters: branches: only: diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml index 93cb2d9f..19006cda 100644 --- a/.github/workflows/merge_stage_test.yml +++ b/.github/workflows/merge_stage_test.yml @@ -41,7 +41,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv>=2.0.0rc1' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -58,12 +58,8 @@ jobs: strategy: matrix: python-version: [3.8] - 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 @@ -89,7 +85,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv==2.0.0rc4' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -143,7 +139,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv>=2.0.0rc1' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -174,7 +170,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv>=2.0.0rc1' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml index 15702817..a2d9f1bf 100644 --- a/.github/workflows/pr_stage_test.yml +++ b/.github/workflows/pr_stage_test.yml @@ -38,7 +38,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv>=2.0.0rc1' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -84,7 +84,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv>=2.0.0rc1' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -118,7 +118,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv==2.0.0rc4' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -158,7 +158,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv==2.0.0rc4' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt @@ -195,7 +195,7 @@ jobs: run: | pip install -U openmim mim install mmengine - mim install 'mmcv>=2.0.0rc1' + mim install 'mmcv>=2.0.0' mim install 'mmdet>=3.0.0rc0' mim install 'mmsegmentation>=1.0.0rc0' pip install -r requirements/tests.txt