Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Fix CI #2029

Merged
merged 30 commits into from
Sep 13, 2022
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d2d6bc6
[CI] Fix CI
MengzhangLI Sep 6, 2022
e353052
fix wrong command
MengzhangLI Sep 7, 2022
a5205e7
remove mmcv
MengzhangLI Sep 7, 2022
daee616
fix lint error
MengzhangLI Sep 7, 2022
b4aef45
add pytorch install
MengzhangLI Sep 7, 2022
c870ad9
fix pytorch installation
MengzhangLI Sep 8, 2022
2cd854f
fix mmengine error
MengzhangLI Sep 8, 2022
40feeab
fix mmcv installation in pr_stage
MengzhangLI Sep 8, 2022
1b02635
fix docstring coverage in lint and delete cu102 in pr_stage windows
MengzhangLI Sep 8, 2022
5f1c798
fix lint.yml and reset test.yml
MengzhangLI Sep 8, 2022
7334880
ignore some ut in build_windows of pr_stage
MengzhangLI Sep 8, 2022
85a3f06
test merge stage test
MeowZheng Sep 9, 2022
1cd4a53
fix mmseg dependencies in pr_stage_test.yml
MengzhangLI Sep 9, 2022
4099318
delete redundant lines in pr_stage and fix mmseg dependencies in mr_s…
MengzhangLI Sep 9, 2022
09b4e4e
fix error in merge_stage
MengzhangLI Sep 9, 2022
c905c78
delete python -m in merge_stage
MengzhangLI Sep 9, 2022
01542c0
fix error in merge_stage
MengzhangLI Sep 9, 2022
e0799f4
let mmcv installation before mmengine
MengzhangLI Sep 9, 2022
7000e4a
fix error of mmcv not found
MengzhangLI Sep 9, 2022
58c482e
fix ut error in merge)stage_test.yml
MengzhangLI Sep 9, 2022
2908474
fix build_windows ut in metge_stage
MengzhangLI Sep 9, 2022
0de409c
fix error
MengzhangLI Sep 9, 2022
8a58c59
fix windows error of merge_stag
MengzhangLI Sep 9, 2022
e4dfb4e
Update .github/workflows/merge_stage_test.yml
MeowZheng Sep 13, 2022
6292f04
Update .github/workflows/merge_stage_test.yml
MeowZheng Sep 13, 2022
88ec4fa
Update .github/workflows/merge_stage_test.yml
MeowZheng Sep 13, 2022
eeebf4a
fix error
MengzhangLI Sep 13, 2022
6b05353
delete skip timm ut
MengzhangLI Sep 13, 2022
5ef3275
add requitements/optinal.txt in test.yml
MengzhangLI Sep 13, 2022
d31ddf0
Update .github/workflows/merge_stage_test.yml
MeowZheng Sep 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 24 additions & 31 deletions .circleci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
type: string
torchvision:
type: string
mmcv:
type: string
docker:
- image: cimg/python:<< parameters.python >>
resource_class: large
Expand All @@ -51,31 +49,32 @@ 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 mmseg dependencies
command: |
python -m pip install git+ssh://git@github.com/open-mmlab/mmengine.git@main
python -m pip install << parameters.mmcv >>
python -m pip install git+ssh://git@github.com/open-mmlab/mmclassification@dev-1.x
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/mmclassification@dev-1.x
pip install -r requirements/tests.txt -r requirements/optional.txt
- run:
name: Build and install
command: |
python -m pip install -e .
pip install -e .
- run:
name: Run unittests
command: |
python -m pip install timm
python -m coverage run --branch --source mmseg -m pytest tests/
python -m coverage xml
python -m coverage report -m
pip install timm
coverage run --branch --source mmseg -m pytest tests/
coverage xml
coverage report -m
- run:
name: Skip timm unittests and generate coverage report
command: |
Expand All @@ -92,8 +91,6 @@ jobs:
cudnn:
type: integer
default: 7
mmcv:
type: string
machine:
image: ubuntu-2004-cuda-11.4:202110-01
# docker_layer_caching: true
Expand All @@ -104,8 +101,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-1.x --depth 1 ssh://git@github.com/open-mmlab/mmclassification.git /home/circleci/mmclassification
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: |
Expand All @@ -115,18 +112,19 @@ jobs:
name: Install mmseg dependencies
command: |
docker exec mmseg pip install -e /mmengine
docker exec mmseg pip install << parameters.mmcv >>
docker exec mmseg pip install -U openmim
docker exec mmseg mim install 'mmcv >= 2.0.0rc1'
docker exec mmseg pip install -e /mmclassification
docker exec mmseg python -m pip install -r requirements.txt
docker exec mmseg pip install -r requirements/tests.txt
MengzhangLI marked this conversation as resolved.
Show resolved Hide resolved
- run:
name: Build and install
command: |
docker exec mmseg pip install -e .
- run:
name: Run unittests
command: |
docker exec mmseg python -m pip install timm
docker exec mmseg python -m pytest tests/
docker exec mmseg pip install timm
docker exec mmseg pytest tests/
workflows:
pr_stage_lint:
when: << pipeline.parameters.lint_only >>
Expand All @@ -137,7 +135,7 @@ workflows:
branches:
ignore:
- dev-1.x
- test-1.x
- 1.x
pr_stage_test:
when:
not:
Expand All @@ -149,21 +147,19 @@ workflows:
branches:
ignore:
- dev-1.x
- test-1.x
- 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
- 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:
Expand All @@ -176,7 +172,6 @@ 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:
Expand All @@ -189,10 +184,8 @@ workflows:
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
Loading