Merge branch 'dev-1.x' into tta_seg

.circleci/test.yml

@@ -26,6 +26,7 @@ jobs:
  command: |
  pip install interrogate
  interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-magic --ignore-regex "__repr__" --fail-under 90 mmdet3d
+
  build_cpu:
  parameters:
  # The python version must match available image tags in
@@ -49,32 +50,37 @@ jobs:
  - run:
  name: Configure Python & pip
  command: |
- python -m pip install --upgrade pip
- python -m pip install wheel
- python -m pip install typing-extensions --upgrade
+ 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
+ - when:
+ condition:
+ equal: ["3.9.0", << parameters.python >>]
+ steps:
+ - run: pip install "protobuf <= 3.20.1" && sudo apt-get update && sudo apt-get -y install libprotobuf-dev protobuf-compiler cmake
  - run:
  name: Install mmdet3d dependencies
  command: |
  python -m pip install git+ssh://git@github.com/open-mmlab/mmengine.git@main
- python -m pip install -U openmim
- python -m 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 -r requirements.txt
+ pip install -U openmim
+ mim install 'mmcv >= 2.0.0rc4'
+ mim install 'mmdet >= 3.0.0'
+ pip install -r requirements.txt
  - run:
  name: Build and install
  command: |
- python -m pip install -e .
+ pip install -e .
  - run:
  name: Run unittests
  command: |
  python -m coverage run --branch --source mmdet3d -m pytest tests/
  python -m coverage xml
  python -m coverage report -m
+
  build_cuda:
  parameters:
  torch:
@@ -102,12 +108,13 @@ jobs:
  command: |
  docker build .circleci/docker -t mmdet3d:gpu --build-arg PYTORCH=<< parameters.torch >> --build-arg CUDA=<< parameters.cuda >> --build-arg CUDNN=<< parameters.cudnn >>
  docker run --gpus all -t -d -v /home/circleci/project:/mmdetection3d -v /home/circleci/mmengine:/mmengine -v /home/circleci/mmdetection:/mmdetection -w /mmdetection3d --name mmdet3d mmdet3d:gpu
+ docker exec mmdet3d apt-get install -y git
  - run:
  name: Install mmdet3d dependencies
  command: |
  docker exec mmdet3d pip install -e /mmengine
  docker exec mmdet3d pip install -U openmim
- docker exec mmdet3d mim install 'mmcv >= 2.0.0rc1'
+ docker exec mmdet3d mim install 'mmcv >= 2.0.0rc4'
  docker exec mmdet3d pip install -e /mmdetection
  docker exec mmdet3d pip install -r requirements.txt
  - run:
@@ -118,6 +125,7 @@ jobs:
  name: Run unittests
  command: |
  docker exec mmdet3d python -m pytest tests/
+
 workflows:
  pr_stage_lint:
  when: << pipeline.parameters.lint_only >>
@@ -142,7 +150,7 @@ workflows:
  name: minimum_version_cpu
  torch: 1.6.0
  torchvision: 0.7.0
- python: 3.7.4
+ python: 3.7.4 # The lowest python 3.7.x version available on CircleCI images
  requires:
  - lint
  - build_cpu:
@@ -171,8 +179,6 @@ workflows:
  - build_cuda:
  name: minimum_version_gpu
  torch: 1.6.0
- # Use double quotation mark to explicitly specify its type
- # as string instead of number
  cuda: "10.1"
  filters:
  branches:

.dev_scripts/benchmark_full_models.txt

@@ -16,12 +16,11 @@ configs/pgd/pgd_r101-caffe_fpn_head-gn_4xb3-4x_kitti-mono3d.py
 configs/point_rcnn/point-rcnn_8xb2_kitti-3d-3class.py
 configs/pointnet2/pointnet2_msg_2xb16-cosine-80e_s3dis-seg.py
 configs/pointnet2/pointnet2_msg_2xb16-cosine-250e_scannet-seg.py
-configs/pointpillars/pointpillars_hv_fpn_sbn-all_8xb2-2x_lyft-3d.py
-configs/pointpillars/pointpillars_hv_secfpn_sbn-all_16xb2-2x_waymoD5-3d-3class.py
+configs/pointpillars/pointpillars_hv_secfpn_8xb6-160e_kitti-3d-3class.py
 configs/pv_rcnn/pv_rcnn_8xb2-80e_kitti-3d-3class.py
 configs/regnet/pointpillars_hv_regnet-1.6gf_fpn_sbn-all_8xb4-2x_nus-3d.py
 configs/second/second_hv_secfpn_8xb6-80e_kitti-3d-3class.py
 configs/second/second_hv_secfpn_8xb6-amp-80e_kitti-3d-3class.py
 configs/smoke/smoke_dla34_dlaneck_gn-all_4xb8-6x_kitti-mono3d.py
-configs/ssn/ssn_hv_secfpn_sbn-all_16xb2-2x_lyft-3d.py
+configs/ssn/ssn_hv_secfpn_sbn-all_16xb2-2x_nus-3d.py
 configs/votenet/votenet_8xb8_scannet-3d.py

.dev_scripts/benchmark_train_models.txt

@@ -6,8 +6,7 @@ configs/mvxnet/mvxnet_fpn_dv_second_secfpn_8xb2-80e_kitti-3d-3class.py
 configs/point_rcnn/point-rcnn_8xb2_kitti-3d-3class.py
 configs/pointnet2/pointnet2_msg_2xb16-cosine-80e_s3dis-seg.py
 configs/pointnet2/pointnet2_msg_2xb16-cosine-250e_scannet-seg.py
-configs/pointpillars/pointpillars_hv_fpn_sbn-all_8xb2-2x_lyft-3d.py
-configs/pointpillars/pointpillars_hv_secfpn_sbn-all_16xb2-2x_waymoD5-3d-3class.py
+configs/pointpillars/pointpillars_hv_secfpn_8xb6-160e_kitti-3d-3class.py
 configs/pv_rcnn/pv_rcnn_8xb2-80e_kitti-3d-3class.py
 configs/second/second_hv_secfpn_8xb6-80e_kitti-3d-3class.py
 configs/second/second_hv_secfpn_8xb6-amp-80e_kitti-3d-3class.py

.dev_scripts/diff_coverage_test.sh

@@ -35,7 +35,7 @@ done
 if [ ! -z "${PY_FILES}" ]
 then
  if [ "$REUSE_COVERAGE_REPORT" == "0" ]; then
- coverage run --branch --source mmocr -m pytest tests/
+ coverage run --branch --source mmdet3d -m pytest tests/
  fi
  coverage report --fail-under 80 -m $PY_FILES
  interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-magic --ignore-regex "__repr__" --fail-under 95 $PY_FILES

.github/workflows/publish-to-pypi.yml → .github/workflows/deploy.yml

@@ -1,4 +1,3 @@
-
 name: deploy
 
 on: push
@@ -9,7 +8,7 @@ concurrency:
 
 jobs:
  build-n-publish:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
  if: startsWith(github.event.ref, 'refs/tags')
  steps:
  - uses: actions/checkout@v2
@@ -19,8 +18,10 @@ jobs:
  python-version: 3.7
  - name: Install torch
  run: pip install torch
+ - name: Install wheel
+ run: pip install wheel
  - name: Build MMDet3D
- run: python setup.py sdist
+ run: python setup.py sdist bdist_wheel
  - name: Publish distribution to PyPI
  run: |
  pip install twine

.github/workflows/lint.yml

@@ -24,4 +24,4 @@ jobs:
  - name: Check docstring coverage
  run: |
  pip install interrogate
- interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-regex "__repr__" --fail-under 90 mmdet3d
+ interrogate -v --ignore-init-method --ignore-magic --ignore-module --ignore-nested-functions --ignore-regex "__repr__" --fail-under 90 mmdet3d