Merge branch 'master' into gpu3

configs/distillers/mimic_backbone/mb_faster_rcnn_r152_fpn_1x_distill_faster_rcnn_r50_fpn_1x_coco.py

@@ -51,5 +51,5 @@ distiller = dict(
                    ]
     )
 
-student_cfg = 'configs/faster_rcnn/faster_rcnn_r152_fpn_1x_coco.py'
-teacher_cfg = 'configs/faster_rcnn/faster_rcnn_r50_fpn_1x_coco.py'
+student_cfg = 'configs/faster_rcnn/faster_rcnn_r50_fpn_1x_coco.py'
+teacher_cfg = 'configs/faster_rcnn/faster_rcnn_r152_fpn_1x_coco.py'

tools/gen_checkpoint.py

@@ -28,7 +28,7 @@ def merge(backbone, neck, head):
     target['state_dict'] = dict()
     tsd = target['state_dict']
     bsd = backbone['state_dict']
-    nsd = backbone['state_dict']
+    nsd = neck['state_dict']
     hsd = head['state_dict']
     for key in bsd.keys():
         if 'backbone' in key: