Update model_zoo url (open-mmlab#2832)

* update model_zoo url

* update mmcv version requirement

configs/_base_/models/faster_rcnn_r50_caffe_c4.py

@@ -2,7 +2,7 @@
 norm_cfg = dict(type='BN', requires_grad=False)
 model = dict(
     type='FasterRCNN',
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         type='ResNet',
         depth=50,

configs/_base_/models/mask_rcnn_r50_caffe_c4.py

@@ -2,7 +2,7 @@
 norm_cfg = dict(type='BN', requires_grad=False)
 model = dict(
     type='MaskRCNN',
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         type='ResNet',
         depth=50,

configs/_base_/models/rpn_r50_caffe_c4.py

@@ -1,7 +1,7 @@
 # model settings
 model = dict(
     type='RPN',
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         type='ResNet',
         depth=50,

configs/cascade_rcnn/cascade_mask_rcnn_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './cascade_mask_rcnn_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/cascade_rcnn/cascade_mask_rcnn_r50_caffe_fpn_1x_coco.py

@@ -1,7 +1,7 @@
 _base_ = ['./cascade_mask_rcnn_r50_fpn_1x_coco.py']
 
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(requires_grad=False), norm_eval=True, style='caffe'))
 

configs/cascade_rcnn/cascade_rcnn_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './cascade_rcnn_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/cascade_rcnn/cascade_rcnn_r50_caffe_fpn_1x_coco.py

@@ -1,7 +1,7 @@
 _base_ = './cascade_rcnn_r50_fpn_1x_coco.py'
 
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(norm_cfg=dict(requires_grad=False), style='caffe'))
 
 # use caffe img_norm

configs/fast_rcnn/fast_rcnn_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './fast_rcnn_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/fast_rcnn/fast_rcnn_r50_caffe_fpn_1x_coco.py

@@ -1,7 +1,7 @@
 _base_ = './fast_rcnn_r50_fpn_1x_coco.py'
 
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(type='BN', requires_grad=False), style='caffe'))
 

configs/faster_rcnn/faster_rcnn_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './faster_rcnn_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/faster_rcnn/faster_rcnn_r50_caffe_fpn_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './faster_rcnn_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(requires_grad=False), norm_eval=True, style='caffe'))
 # use caffe img_norm

configs/faster_rcnn/faster_rcnn_r50_caffe_fpn_mstrain_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './faster_rcnn_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(requires_grad=False), norm_eval=True, style='caffe'))
 # use caffe img_norm

configs/fcos/fcos_r101_caffe_fpn_gn-head_4x4_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './fcos_r50_caffe_fpn_gn-head_4x4_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/fcos/fcos_r101_caffe_fpn_gn-head_4x4_2x_coco.py

@@ -1,3 +1,4 @@
 _base_ = ['./fcos_r50_caffe_fpn_gn-head_4x4_2x_coco.py']
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/fcos/fcos_r101_caffe_fpn_gn-head_mstrain_640-800_4x4_2x_coco.py

@@ -1,6 +1,7 @@
 _base_ = './fcos_r50_caffe_fpn_gn-head_4x4_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))
 img_norm_cfg = dict(
     mean=[103.530, 116.280, 123.675], std=[1.0, 1.0, 1.0], to_rgb=False)
 train_pipeline = [

configs/fcos/fcos_r50_caffe_fpn_4x4_1x_coco.py

@@ -5,7 +5,7 @@
 # model settings
 model = dict(
     type='FCOS',
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         type='ResNet',
         depth=50,
@@ -20,7 +20,8 @@
         in_channels=[256, 512, 1024, 2048],
         out_channels=256,
         start_level=1,
-        add_extra_convs='on_output',  # use P5
+        add_extra_convs=True,
+        extra_convs_on_inputs=False,  # use P5
         num_outs=5,
         relu_before_extra_convs=True),
     bbox_head=dict(

configs/fcos/fcos_r50_caffe_fpn_gn-head_4x4_1x_coco.py

@@ -5,7 +5,7 @@
 # model settings
 model = dict(
     type='FCOS',
-    pretrained='open-mmlab://resnet50_caffe',
+    pretrained='open-mmlab://detectron/resnet50_caffe',
     backbone=dict(
         type='ResNet',
         depth=50,
@@ -20,7 +20,8 @@
         in_channels=[256, 512, 1024, 2048],
         out_channels=256,
         start_level=1,
-        add_extra_convs='on_output',  # use P5
+        add_extra_convs=True,
+        extra_convs_on_inputs=False,  # use P5
         num_outs=5,
         relu_before_extra_convs=True),
     bbox_head=dict(

configs/guided_anchoring/ga_fast_r50_caffe_fpn_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = '../fast_rcnn/fast_rcnn_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         type='ResNet',
         depth=50,

configs/guided_anchoring/ga_faster_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './ga_faster_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/guided_anchoring/ga_retinanet_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './ga_retinanet_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/guided_anchoring/ga_retinanet_r101_caffe_fpn_mstrain_2x.py

@@ -1,7 +1,7 @@
 # model settings
 model = dict(
     type='RetinaNet',
-    pretrained='open-mmlab://resnet101_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
     backbone=dict(
         type='ResNet',
         depth=101,
@@ -16,7 +16,7 @@
         in_channels=[256, 512, 1024, 2048],
         out_channels=256,
         start_level=1,
-        add_extra_convs='on_input',
+        add_extra_convs=True,
         num_outs=5),
     bbox_head=dict(
         type='GARetinaHead',

configs/guided_anchoring/ga_rpn_r101_caffe_fpn_1x_coco.py

@@ -1,4 +1,5 @@
 _base_ = './ga_rpn_r50_caffe_fpn_1x_coco.py'
 # model settings
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/legacy_1.x/retinanet_r50_caffe_fpn_1x_coco_v1.py

@@ -1,6 +1,6 @@
 _base_ = './retinanet_r50_fpn_1x_coco_v1.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe',
+    pretrained='open-mmlab://detectron/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(requires_grad=False), norm_eval=True, style='caffe'))
 # use caffe img_norm

configs/mask_rcnn/mask_rcnn_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './mask_rcnn_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/mask_rcnn/mask_rcnn_r50_caffe_fpn_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './mask_rcnn_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(norm_cfg=dict(requires_grad=False), style='caffe'))
 # use caffe img_norm
 img_norm_cfg = dict(

configs/mask_rcnn/mask_rcnn_r50_caffe_fpn_mstrain-poly_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './mask_rcnn_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(norm_cfg=dict(requires_grad=False), style='caffe'))
 # use caffe img_norm
 img_norm_cfg = dict(

configs/mask_rcnn/mask_rcnn_r50_caffe_fpn_mstrain_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './mask_rcnn_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(norm_cfg=dict(requires_grad=False), style='caffe'))
 # use caffe img_norm
 img_norm_cfg = dict(

configs/ms_rcnn/ms_rcnn_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './ms_rcnn_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/retinanet/retinanet_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './retinanet_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/retinanet/retinanet_r50_caffe_fpn_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './retinanet_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(requires_grad=False), norm_eval=True, style='caffe'))
 # use caffe img_norm

configs/retinanet/retinanet_r50_caffe_fpn_mstrain_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './retinanet_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(requires_grad=False), norm_eval=True, style='caffe'))
 # use caffe img_norm

configs/rpn/rpn_r101_caffe_fpn_1x_coco.py

@@ -1,3 +1,4 @@
 _base_ = './rpn_r50_caffe_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet101_caffe_bgr', backbone=dict(depth=101))
+    pretrained='open-mmlab://detectron2/resnet101_caffe',
+    backbone=dict(depth=101))

configs/rpn/rpn_r50_caffe_fpn_1x_coco.py

@@ -1,6 +1,6 @@
 _base_ = './rpn_r50_fpn_1x_coco.py'
 model = dict(
-    pretrained='open-mmlab://resnet50_caffe_bgr',
+    pretrained='open-mmlab://detectron2/resnet50_caffe',
     backbone=dict(
         norm_cfg=dict(requires_grad=False), norm_eval=True, style='caffe'))
 # use caffe img_norm

requirements/runtime.txt

@@ -1,5 +1,5 @@
 matplotlib
-mmcv>=0.5.3
+mmcv>=0.5.7
 numpy
 # need older pillow until torchvision is fixed
 Pillow<=6.2.2