From e8f29c7a9c229cef2228446e0ffcc64c6e2ca701 Mon Sep 17 00:00:00 2001 From: Tao Gong Date: Wed, 8 Feb 2023 10:01:35 +0800 Subject: [PATCH 1/7] fix ci --- mmtrack/models/track_heads/mask2former_head.py | 2 +- tests/test_datasets/test_transforms/test_loading.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mmtrack/models/track_heads/mask2former_head.py b/mmtrack/models/track_heads/mask2former_head.py index c668a07c4..247309fcc 100644 --- a/mmtrack/models/track_heads/mask2former_head.py +++ b/mmtrack/models/track_heads/mask2former_head.py @@ -673,7 +673,7 @@ def predict_by_feat(self, if len(mask_cls_results) > 0: scores = F.softmax(mask_cls_results, dim=-1)[:, :-1] labels = torch.arange(self.num_classes).unsqueeze(0).repeat( - self.num_queries, 1).flatten(0, 1) + self.num_queries, 1).flatten(0, 1).to(scores.device) # keep top-10 predictions scores_per_image, topk_indices = scores.flatten(0, 1).topk( 10, sorted=False) diff --git a/tests/test_datasets/test_transforms/test_loading.py b/tests/test_datasets/test_transforms/test_loading.py index 9799fd05d..5713bab55 100644 --- a/tests/test_datasets/test_transforms/test_loading.py +++ b/tests/test_datasets/test_transforms/test_loading.py @@ -52,4 +52,4 @@ def test_repr(self): 'with_label=False, with_instance_id=True, ' 'with_mask=False, with_seg=False, ' "poly2mask=True, imdecode_backend='cv2', " - "file_client_args={'backend': 'disk'})") + "file_client_args=None)") From 6d27dd51cca431aaa739e93d9072819ed7d5cd08 Mon Sep 17 00:00:00 2001 From: Tao Gong Date: Wed, 8 Feb 2023 10:18:15 +0800 Subject: [PATCH 2/7] fix ci --- docs/en/user_guides/2_dataset_prepare.md | 1 + tests/test_datasets/test_transforms/test_loading.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/user_guides/2_dataset_prepare.md b/docs/en/user_guides/2_dataset_prepare.md index 204f84210..80a434ab9 100644 --- a/docs/en/user_guides/2_dataset_prepare.md +++ b/docs/en/user_guides/2_dataset_prepare.md @@ -39,6 +39,7 @@ Please download the datasets from the official websites. It is recommended to sy - The `annotations` under `lvis` contains the official annotations of lvis-v0.5 which can be downloaded according to [here](https://github.com/lvis-dataset/lvis-api/issues/23#issuecomment-894963957). The synset mapping file `coco_to_lvis_synset.json` used in `./tools/dataset_converters/tao/merge_coco_with_lvis.py` script can be found [here](https://github.com/TAO-Dataset/tao/tree/master/data). - For users in China, the following datasets can be downloaded from [OpenDataLab](https://opendatalab.com/) with high speed: + - [MOT17](https://opendatalab.com/MOT17/download) - [CrowdHuman](https://opendatalab.com/CrowdHuman/download) - [LVIS](https://opendatalab.com/LVIS/download) diff --git a/tests/test_datasets/test_transforms/test_loading.py b/tests/test_datasets/test_transforms/test_loading.py index 5713bab55..59c3b337c 100644 --- a/tests/test_datasets/test_transforms/test_loading.py +++ b/tests/test_datasets/test_transforms/test_loading.py @@ -52,4 +52,4 @@ def test_repr(self): 'with_label=False, with_instance_id=True, ' 'with_mask=False, with_seg=False, ' "poly2mask=True, imdecode_backend='cv2', " - "file_client_args=None)") + 'file_client_args=None)') From b8c744791fcfe808b247c7803d7978ce9f0a6ea3 Mon Sep 17 00:00:00 2001 From: Tao Gong Date: Wed, 8 Feb 2023 11:56:03 +0800 Subject: [PATCH 3/7] fix ci --- .circleci/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/test.yml b/.circleci/test.yml index 0a558d3ad..7fb4c1fa0 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -63,13 +63,13 @@ jobs: name: Install mmtrack dependencies command: | pip install -U openmim - python -m pip install git+https://github.com/votchallenge/toolkit.git 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/mmdetection.git@dev-3.x python -m pip install git+ssh://git@github.com/open-mmlab/mmclassification.git@dev-1.x python -m pip install -r requirements.txt python -m pip install git+https://github.com/JonathonLuiten/TrackEval.git + python -m pip install git+https://github.com/votchallenge/toolkit.git python -m pip install git+https://github.com/TAO-Dataset/tao.git - run: name: Build and install From 469d75ce709a93b090383dba4e05e87fd0fc663b Mon Sep 17 00:00:00 2001 From: Tao Gong Date: Wed, 8 Feb 2023 13:55:49 +0800 Subject: [PATCH 4/7] fix ci --- .circleci/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/test.yml b/.circleci/test.yml index 7fb4c1fa0..3a95d07b5 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -157,7 +157,7 @@ workflows: name: minimum_version_cpu torch: 1.7.0 torchvision: 0.8.1 - python: 3.6.9 # The lowest python 3.6.x version available on CircleCI images + python: 3.7.4 # The lowest python 3.7.x version available on CircleCI images mmcv: https://download.openmmlab.com/mmcv/dist/cpu/torch1.6.0/mmcv-2.0.0rc1-cp36-cp36m-manylinux1_x86_64.whl requires: - lint From defe0854117417aed1ee8b240797fd284033d819 Mon Sep 17 00:00:00 2001 From: Tao Gong Date: Wed, 8 Feb 2023 15:26:16 +0800 Subject: [PATCH 5/7] fix ci --- .circleci/test.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/test.yml b/.circleci/test.yml index 3a95d07b5..540fe69ed 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -64,7 +64,7 @@ jobs: command: | pip install -U openmim python -m pip install git+ssh://git@github.com/open-mmlab/mmengine.git@main - python -m pip install << parameters.mmcv >> + mim install 'mmcv >= 2.0.0rc1' python -m pip install git+ssh://git@github.com/open-mmlab/mmdetection.git@dev-3.x python -m pip install git+ssh://git@github.com/open-mmlab/mmclassification.git@dev-1.x python -m pip install -r requirements.txt @@ -117,7 +117,7 @@ jobs: docker exec mmtrack apt-get -y install git docker exec mmtrack pip install -e /mmengine docker exec mmtrack pip install -U openmim - docker exec mmtrack pip install << parameters.mmcv >> + docker exec mmtrack mim install 'mmcv >= 2.0.0rc1' docker exec mmtrack pip install -e /mmdetection docker exec mmtrack pip install -e /mmclassification docker exec mmtrack pip install -r requirements.txt @@ -158,7 +158,6 @@ workflows: torch: 1.7.0 torchvision: 0.8.1 python: 3.7.4 # The lowest python 3.7.x version available on CircleCI images - mmcv: https://download.openmmlab.com/mmcv/dist/cpu/torch1.6.0/mmcv-2.0.0rc1-cp36-cp36m-manylinux1_x86_64.whl requires: - lint - build_cpu: @@ -166,7 +165,6 @@ workflows: torch: 1.13.0 torchvision: 0.14.0 python: 3.9.0 - mmcv: https://download.openmmlab.com/mmcv/dist/cpu/torch1.9.0/mmcv-2.0.0rc1-cp39-cp39-manylinux1_x86_64.whl requires: - minimum_version_cpu - hold: @@ -179,7 +177,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/dist/cu102/torch1.8.0/mmcv-2.0.0rc1-cp37-cp37m-manylinux1_x86_64.whl requires: - hold merge_stage_test: @@ -192,7 +189,6 @@ workflows: torch: 1.8.1 # Use double quotation mark to explicitly specify its type # as string instead of number - mmcv: https://download.openmmlab.com/mmcv/dist/cu102/torch1.8.0/mmcv-2.0.0rc1-cp37-cp37m-manylinux1_x86_64.whl cuda: "10.2" filters: branches: From c951d4073443383925c62adb6f55763b6469eae7 Mon Sep 17 00:00:00 2001 From: Tao Gong Date: Wed, 8 Feb 2023 15:28:49 +0800 Subject: [PATCH 6/7] fix ci --- .circleci/test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/test.yml b/.circleci/test.yml index 540fe69ed..7808093c5 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -37,8 +37,6 @@ jobs: type: string torchvision: type: string - mmcv: - type: string docker: - image: cimg/python:<< parameters.python >> resource_class: large @@ -91,8 +89,6 @@ jobs: cudnn: type: integer default: 7 - mmcv: - type: string machine: image: ubuntu-2004-cuda-11.4:202110-01 # docker_layer_caching: true From c11e887b8da5fd85799413bd84a019680a926a40 Mon Sep 17 00:00:00 2001 From: Tao Gong Date: Wed, 8 Feb 2023 15:44:54 +0800 Subject: [PATCH 7/7] fix ci --- .circleci/test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/test.yml b/.circleci/test.yml index 7808093c5..4f34ca2b1 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -63,7 +63,9 @@ jobs: pip install -U openmim python -m pip install git+ssh://git@github.com/open-mmlab/mmengine.git@main mim install 'mmcv >= 2.0.0rc1' - python -m pip install git+ssh://git@github.com/open-mmlab/mmdetection.git@dev-3.x + # TODO: fix bc-breaking from mmdet detr-refactor + # python -m pip install git+ssh://git@github.com/open-mmlab/mmdetection.git@dev-3.x + mim install 'mmdet == 3.0.0rc5' python -m pip install git+ssh://git@github.com/open-mmlab/mmclassification.git@dev-1.x python -m pip install -r requirements.txt python -m pip install git+https://github.com/JonathonLuiten/TrackEval.git @@ -114,7 +116,9 @@ jobs: docker exec mmtrack pip install -e /mmengine docker exec mmtrack pip install -U openmim docker exec mmtrack mim install 'mmcv >= 2.0.0rc1' - docker exec mmtrack pip install -e /mmdetection + # TODO: fix bc-breaking from mmdet detr-refactor + # docker exec mmtrack pip install -e /mmdetection + docker exec mmtrack mim install 'mmdet == 3.0.0rc5' docker exec mmtrack pip install -e /mmclassification docker exec mmtrack pip install -r requirements.txt docker exec mmtrack python -m pip install git+https://github.com/JonathonLuiten/TrackEval.git