Merge branch 'dev' of https://github.com/open-mmlab/mmdetection into …

…patch-1

.circleci/config.yml

@@ -0,0 +1,168 @@
+version: 2.1
+
+jobs:
+  lint:
+    docker:
+      - image: cimg/python:3.7.4
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-add-repository ppa:brightbox/ruby-ng -y
+            sudo apt-get update
+            sudo apt-get install -y ruby2.7
+      - run:
+          name: Install pre-commit hook
+          command: |
+            pip install pre-commit
+            pre-commit install
+      - run:
+          name: Linting
+          command: pre-commit run --all-files
+      - run:
+          name: Check docstring coverage
+          command: |
+            pip install interrogate
+            interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-regex "__repr__" --fail-under 50 mmdet
+
+  build_cpu:
+    parameters:
+      # The python version must match available image tags in
+      # https://circleci.com/developer/images/image/cimg/python
+      python:
+        type: string
+        default: "3.7.4"
+      torch:
+        type: string
+      torchvision:
+        type: string
+    docker:
+      - image: cimg/python:<< parameters.python >>
+    resource_class: large
+    steps:
+      - checkout
+      - run:
+          name: Install Libraries
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libgl1-mesa-glx libjpeg-dev zlib1g-dev libtinfo-dev libncurses5
+      - run:
+          name: Configure Python & pip
+          command: |
+            pip install --upgrade pip
+            pip install wheel
+      - run:
+          name: Install PyTorch
+          command: |
+            python -V
+            pip install torch==<< parameters.torch >>+cpu torchvision==<< parameters.torchvision >>+cpu -f https://download.pytorch.org/whl/torch_stable.html
+      - when:
+          condition:
+            equal: [ "3.9.0", << parameters.python >> ]
+          steps:
+            - run: pip install protobuf && sudo apt-get update && sudo apt-get -y install libprotobuf-dev protobuf-compiler cmake
+      - run:
+          name: Install mmdet dependencies
+          command: |
+            pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cpu/torch<< parameters.torch >>/index.html
+            pip install -r requirements/tests.txt -r requirements/optional.txt
+            pip install albumentations>=0.3.2 --no-binary imgaug,albumentations
+            pip install git+https://github.com/cocodataset/panopticapi.git
+      - run:
+          name: Build and install
+          command: |
+            pip install -e .
+      - run:
+          name: Run unittests
+          command: |
+            coverage run --branch --source mmdet -m pytest tests/
+            coverage xml
+            coverage report -m
+
+  build_cu101:
+    machine:
+      image: ubuntu-1604-cuda-10.1:201909-23
+    resource_class: gpu.nvidia.small
+    steps:
+      - checkout
+      - run:
+          name: Install Libraries
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libgl1-mesa-glx
+      - run:
+          name: Configure Python & pip
+          command: |
+            pyenv global 3.7.0
+            pip install --upgrade pip
+            pip install wheel
+      - run:
+          name: Install PyTorch
+          command: |
+            python -V
+            pip install torch==1.6.0+cu101 torchvision==0.7.0+cu101 -f https://download.pytorch.org/whl/torch_stable.html
+      - run:
+          name: Install mmdet dependencies
+          # pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/torch${{matrix.torch_version}}/index.html
+          command: |
+            pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/torch1.6.0/index.html
+            pip install -r requirements/tests.txt -r requirements/optional.txt
+            pip install pycocotools
+            pip install albumentations>=0.3.2 --no-binary imgaug,albumentations
+            pip install git+https://github.com/cocodataset/panopticapi.git
+            python -c 'import mmcv; print(mmcv.__version__)'
+      - run:
+          name: Build and install
+          command: |
+            python setup.py check -m -s
+            TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
+      - run:
+          name: Run unittests
+          command: |
+            pytest tests/
+
+workflows:
+  unit_tests:
+    jobs:
+      - lint
+      - build_cpu:
+          name: build_cpu_th1.6
+          torch: 1.6.0
+          torchvision: 0.7.0
+          requires:
+            - lint
+      - build_cpu:
+          name: build_cpu_th1.7
+          torch: 1.7.0
+          torchvision: 0.8.1
+          requires:
+            - lint
+      - build_cpu:
+          name: build_cpu_th1.8_py3.9
+          torch: 1.8.0
+          torchvision: 0.9.0
+          python: "3.9.0"
+          requires:
+            - lint
+      - build_cpu:
+          name: build_cpu_th1.9_py3.8
+          torch: 1.9.0
+          torchvision: 0.10.0
+          python: "3.8.12"
+          requires:
+            - lint
+      - build_cpu:
+          name: build_cpu_th1.9_py3.9
+          torch: 1.9.0
+          torchvision: 0.10.0
+          python: "3.9.0"
+          requires:
+            - lint
+      - build_cu101:
+          requires:
+            - build_cpu_th1.6
+            - build_cpu_th1.7
+            - build_cpu_th1.8_py3.9
+            - build_cpu_th1.9_py3.8
+            - build_cpu_th1.9_py3.9

.dev_scripts/batch_train_list.txt

@@ -15,8 +15,8 @@ configs/faster_rcnn/faster_rcnn_r50_caffe_fpn_mstrain_1x_coco.py
 configs/faster_rcnn/faster_rcnn_r50_caffe_fpn_1x_coco.py
 configs/faster_rcnn/faster_rcnn_r50_fpn_ohem_1x_coco.py
 configs/foveabox/fovea_align_r50_fpn_gn-head_4x4_2x_coco.py
-configs/fp16/mask_rcnn_r50_fpn_fp16_1x_coco.py
-configs/fp16/retinanet_r50_fpn_fp16_1x_coco.py
+configs/mask_rcnn/mask_rcnn_r50_fpn_fp16_1x_coco.py
+configs/retinanet/retinanet_r50_fpn_fp16_1x_coco.py
 configs/free_anchor/retinanet_free_anchor_r50_fpn_1x_coco.py
 configs/fsaf/fsaf_r50_fpn_1x_coco.py
 configs/gfl/gfl_r50_fpn_1x_coco.py

.dev_scripts/benchmark_filter.py

@@ -84,8 +84,8 @@ def parse_args():
     'configs/faster_rcnn/faster_rcnn_r50_caffe_dc5_mstrain_1x_coco.py',
     'configs/fcos/fcos_center_r50_caffe_fpn_gn-head_4x4_1x_coco.py',
     'configs/foveabox/fovea_align_r50_fpn_gn-head_4x4_2x_coco.py',
-    'configs/fp16/retinanet_r50_fpn_fp16_1x_coco.py',
-    'configs/fp16/mask_rcnn_r50_fpn_fp16_1x_coco.py',
+    'configs/retinanet/retinanet_r50_fpn_fp16_1x_coco.py',
+    'configs/mask_rcnn/mask_rcnn_r50_fpn_fp16_1x_coco.py',
     'configs/free_anchor/retinanet_free_anchor_r50_fpn_1x_coco.py',
     'configs/fsaf/fsaf_r50_fpn_1x_coco.py',
     'configs/gcnet/mask_rcnn_r50_fpn_r4_gcb_c3-c5_1x_coco.py',

.dev_scripts/benchmark_inference_fps.py

@@ -7,6 +7,7 @@
 from mmcv import Config, DictAction
 from mmcv.runner import init_dist
 from terminaltables import GithubFlavoredMarkdownTable
+
 from tools.analysis_tools.benchmark import repeat_measure_inference_speed
 
 

.dev_scripts/check_links.py

@@ -0,0 +1,157 @@
+# Modified from:
+# https://github.com/allenai/allennlp/blob/main/scripts/check_links.py
+
+import argparse
+import logging
+import os
+import pathlib
+import re
+import sys
+from multiprocessing.dummy import Pool
+from typing import NamedTuple, Optional, Tuple
+
+import requests
+from mmcv.utils import get_logger
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description='Goes through all the inline-links '
+        'in markdown files and reports the breakages')
+    parser.add_argument(
+        '--num-threads',
+        type=int,
+        default=100,
+        help='Number of processes to confirm the link')
+    parser.add_argument('--https-proxy', type=str, help='https proxy')
+    parser.add_argument(
+        '--out',
+        type=str,
+        default='link_reports.txt',
+        help='output path of reports')
+    args = parser.parse_args()
+    return args
+
+
+OK_STATUS_CODES = (
+    200,
+    401,  # the resource exists but may require some sort of login.
+    403,  # ^ same
+    405,  # HEAD method not allowed.
+    # the resource exists, but our default 'Accept-' header may not
+    # match what the server can provide.
+    406,
+)
+
+
+class MatchTuple(NamedTuple):
+    source: str
+    name: str
+    link: str
+
+
+def check_link(
+        match_tuple: MatchTuple,
+        http_session: requests.Session,
+        logger: logging = None) -> Tuple[MatchTuple, bool, Optional[str]]:
+    reason: Optional[str] = None
+    if match_tuple.link.startswith('http'):
+        result_ok, reason = check_url(match_tuple, http_session)
+    else:
+        result_ok = check_path(match_tuple)
+    if logger is None:
+        print(f"  {'✓' if result_ok else '✗'} {match_tuple.link}")
+    else:
+        logger.info(f"  {'✓' if result_ok else '✗'} {match_tuple.link}")
+    return match_tuple, result_ok, reason
+
+
+def check_url(match_tuple: MatchTuple,
+              http_session: requests.Session) -> Tuple[bool, str]:
+    """Check if a URL is reachable."""
+    try:
+        result = http_session.head(
+            match_tuple.link, timeout=5, allow_redirects=True)
+        return (
+            result.ok or result.status_code in OK_STATUS_CODES,
+            f'status code = {result.status_code}',
+        )
+    except (requests.ConnectionError, requests.Timeout):
+        return False, 'connection error'
+
+
+def check_path(match_tuple: MatchTuple) -> bool:
+    """Check if a file in this repository exists."""
+    relative_path = match_tuple.link.split('#')[0]
+    full_path = os.path.join(
+        os.path.dirname(str(match_tuple.source)), relative_path)
+    return os.path.exists(full_path)
+
+
+def main():
+    args = parse_args()
+
+    # setup logger
+    logger = get_logger(name='mmdet', log_file=args.out)
+
+    # setup https_proxy
+    if args.https_proxy:
+        os.environ['https_proxy'] = args.https_proxy
+
+    # setup http_session
+    http_session = requests.Session()
+    for resource_prefix in ('http://', 'https://'):
+        http_session.mount(
+            resource_prefix,
+            requests.adapters.HTTPAdapter(
+                max_retries=5,
+                pool_connections=20,
+                pool_maxsize=args.num_threads),
+        )
+
+    logger.info('Finding all markdown files in the current directory...')
+
+    project_root = (pathlib.Path(__file__).parent / '..').resolve()
+    markdown_files = project_root.glob('**/*.md')
+
+    all_matches = set()
+    url_regex = re.compile(r'\[([^!][^\]]+)\]\(([^)(]+)\)')
+    for markdown_file in markdown_files:
+        with open(markdown_file) as handle:
+            for line in handle.readlines():
+                matches = url_regex.findall(line)
+                for name, link in matches:
+                    if 'localhost' not in link:
+                        all_matches.add(
+                            MatchTuple(
+                                source=str(markdown_file),
+                                name=name,
+                                link=link))
+
+    logger.info(f'  {len(all_matches)} markdown files found')
+    logger.info('Checking to make sure we can retrieve each link...')
+
+    with Pool(processes=args.num_threads) as pool:
+        results = pool.starmap(check_link, [(match, http_session, logger)
+                                            for match in list(all_matches)])
+
+    # collect unreachable results
+    unreachable_results = [(match_tuple, reason)
+                           for match_tuple, success, reason in results
+                           if not success]
+
+    if unreachable_results:
+        logger.info('================================================')
+        logger.info(f'Unreachable links ({len(unreachable_results)}):')
+        for match_tuple, reason in unreachable_results:
+            logger.info('  > Source: ' + match_tuple.source)
+            logger.info('    Name: ' + match_tuple.name)
+            logger.info('    Link: ' + match_tuple.link)
+            if reason is not None:
+                logger.info('    Reason: ' + reason)
+        sys.exit(1)
+    logger.info('No Unreachable link found.')
+
+
+if __name__ == '__main__':
+    main()