diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f5658264..601069c2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,6 +43,8 @@ repos: rev: v1.0.0 hooks: - id: mypy + args: + - --no-incremental additional_dependencies: - todd_ai - repo: https://github.com/codespell-project/codespell diff --git a/configs/HEAD/HEAD_retina_faster_mnv2_fpn_mstrain_1x_coco.py b/configs/HEAD/HEAD_retina_faster_mnv2_fpn_mstrain_1x_coco.py deleted file mode 100644 index 7549442a..00000000 --- a/configs/HEAD/HEAD_retina_faster_mnv2_fpn_mstrain_1x_coco.py +++ /dev/null @@ -1,9 +0,0 @@ -_base_ = [ - '../_base_/models/head_retina_faster.py', - '../_base_/models/mnv2_fpn.py', - '../_base_/datasets/coco_detection_mstrain.py', - '../_base_/schedules/schedule_1x.py', - '../_base_/default_runtime.py', -] - -optimizer = dict(lr=0.01) diff --git a/configs/HEAD/head_retina_faster_r18_fpn_mstrain_1x_coco.py b/configs/HEAD/head_retina_faster_r18_fpn_mstrain_1x_coco.py deleted file mode 100644 index 503c74f7..00000000 --- a/configs/HEAD/head_retina_faster_r18_fpn_mstrain_1x_coco.py +++ /dev/null @@ -1,9 +0,0 @@ -_base_ = [ - '../_base_/models/head_retina_faster.py', - '../_base_/models/r18_fpn.py', - '../_base_/datasets/coco_detection_mstrain.py', - '../_base_/schedules/schedule_1x.py', - '../_base_/default_runtime.py', -] - -optimizer = dict(lr=0.01) diff --git a/configs/HEAD_dag/HEAD_dag_retina_faster_mnv2_fpn_mstrain_1x_coco.py b/configs/HEAD_dag/HEAD_dag_retina_faster_mnv2_fpn_mstrain_1x_coco.py deleted file mode 100644 index 52577347..00000000 --- a/configs/HEAD_dag/HEAD_dag_retina_faster_mnv2_fpn_mstrain_1x_coco.py +++ /dev/null @@ -1,9 +0,0 @@ -_base_ = [ - '../_base_/models/head_dag_retina_faster.py', - '../_base_/models/mnv2_fpn.py', - '../_base_/datasets/coco_detection_mstrain.py', - '../_base_/schedules/schedule_1x.py', - '../_base_/default_runtime.py', -] - -optimizer = dict(lr=0.01) diff --git a/configs/HEAD_dag/head_dag_retina_faster_r18_fpn_mstrain_1x_coco.py b/configs/HEAD_dag/head_dag_retina_faster_r18_fpn_mstrain_1x_coco.py deleted file mode 100644 index 5e38fa4e..00000000 --- a/configs/HEAD_dag/head_dag_retina_faster_r18_fpn_mstrain_1x_coco.py +++ /dev/null @@ -1,9 +0,0 @@ -_base_ = [ - '../_base_/models/head_dag_retina_faster.py', - '../_base_/models/r18_fpn.py', - '../_base_/datasets/coco_detection_mstrain.py', - '../_base_/schedules/schedule_1x.py', - '../_base_/default_runtime.py', -] - -optimizer = dict(lr=0.01) diff --git a/head/prior_generators.py b/head/prior_generators.py index 48223729..9cf5b513 100644 --- a/head/prior_generators.py +++ b/head/prior_generators.py @@ -33,7 +33,7 @@ def single_level_grid_priors( dtype: torch.dtype = torch.float32, device: Union[str, torch.device] = 'cuda', ) -> torch.Tensor: - priors = super().single_level_grid_priors( + priors = super().single_level_grid_priors( # type: ignore[safe-super] featmap_size, level_idx, dtype, diff --git a/head/roi_heads.py b/head/roi_heads.py index 87c4e388..b9dff4fd 100644 --- a/head/roi_heads.py +++ b/head/roi_heads.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, List, Optional +from typing import Any, Dict, List, Optional, Sequence import torch from mmdet.core import BaseAssigner @@ -19,7 +19,7 @@ def _sample( proposal_list: List[torch.Tensor], gt_bboxes: List[torch.Tensor], gt_labels: List[torch.Tensor], - gt_bboxes_ignore: List[Optional[torch.Tensor]], + gt_bboxes_ignore: Sequence[Optional[torch.Tensor]], ): sampling_results: List[SamplingResultWithBBoxIDs] = [] for i, (proposal, gt_bbox, gt_label, gt_bbox_ignore) in enumerate( @@ -71,7 +71,7 @@ def forward_train( proposal_list: List[torch.Tensor], gt_bboxes: List[torch.Tensor], gt_labels: List[torch.Tensor], - gt_bboxes_ignore: Optional[List[torch.Tensor]] = None, + gt_bboxes_ignore: Optional[Sequence[Optional[torch.Tensor]]] = None, gt_masks: Optional[List[Any]] = None, **kwargs, ): diff --git a/pyproject.toml b/pyproject.toml index 1312b4bb..06a5e240 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,5 +37,14 @@ files = [ 'head', ] +[[tool.mypy.overrides]] +module = [ + 'mmcv.*', + 'mmdet.*', + 'todd.*', +] +ignore_missing_imports = true + + [tool.commitizen] name = 'cz_conventional_commits'