add MaskRCNN

.pfnci/config.pbtxt

@@ -23,7 +23,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -73,7 +73,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -150,7 +150,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -200,7 +200,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -277,7 +277,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -327,7 +327,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -404,7 +404,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -454,7 +454,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -531,7 +531,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -581,7 +581,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -658,7 +658,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {
@@ -708,7 +708,7 @@ configs {
       disk: 10
     }
     time_limit {
-      seconds: 1800
+      seconds: 3600
     }
     command: "sh .pfnci/tests.sh"
     environment_variables {

.pfnci/gen_config.py

@@ -31,7 +31,7 @@ def test_config(python, chainer, optional, target):
     if target == 'cpu':
         value['requirement']['cpu'] = 6
         value['requirement']['memory'] = 36
-        value['time_limit'] = {'seconds': 1800}
+        value['time_limit'] = {'seconds': 3600}
         value['command'] = 'sh .pfnci/tests.sh'
     elif target == 'gpu':
         key += '.gpu'

README.md

@@ -16,7 +16,7 @@ Supported tasks:
 + Image Classification ([ResNet](examples/resnet), [SENet](examples/senet), [VGG](examples/vgg))
 + Object Detection ([tutorial](http://chainercv.readthedocs.io/en/latest/tutorial/detection.html), [Faster R-CNN](examples/faster_rcnn), [FPN](examples/fpn), [SSD](examples/ssd), [YOLO](examples/yolo))
 + Semantic Segmentation ([SegNet](examples/segnet), [PSPNet](examples/pspnet))
-+ Instance Segmentation ([FCIS](examples/fcis),)
++ Instance Segmentation ([FCIS](examples/fcis), [Mask R-CNN](examples/fpn))
 
 # Guiding Principles
 ChainerCV is developed under the following three guiding principles.

chainercv/__init__.py

@@ -19,5 +19,5 @@
 
 
 global_config.cv_read_image_backend = 'cv2'
-global_config.cv_resize_backend = 'cv2'
+global_config.cv_resize_backend = None
 global_config.cv_rotate_backend = 'cv2'

chainercv/links/__init__.py

@@ -11,6 +11,8 @@
 from chainercv.links.model.faster_rcnn.faster_rcnn_vgg import FasterRCNNVGG16  # NOQA
 from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import FasterRCNNFPNResNet101  # NOQA
 from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import FasterRCNNFPNResNet50  # NOQA
+from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import MaskRCNNFPNResNet101  # NOQA
+from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import MaskRCNNFPNResNet50  # NOQA
 from chainercv.links.model.resnet import ResNet101  # NOQA
 from chainercv.links.model.resnet import ResNet152  # NOQA
 from chainercv.links.model.resnet import ResNet50  # NOQA

chainercv/links/model/fpn/__init__.py

@@ -1,9 +1,17 @@
+from chainercv.links.model.fpn.bbox_head import bbox_head_loss_post  # NOQA
+from chainercv.links.model.fpn.bbox_head import bbox_head_loss_pre  # NOQA
+from chainercv.links.model.fpn.bbox_head import BboxHead  # NOQA
 from chainercv.links.model.fpn.faster_rcnn import FasterRCNN  # NOQA
+from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import FasterRCNNFPNResNet  # NOQA
 from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import FasterRCNNFPNResNet101  # NOQA
 from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import FasterRCNNFPNResNet50  # NOQA
+from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import MaskRCNNFPNResNet101  # NOQA
+from chainercv.links.model.fpn.faster_rcnn_fpn_resnet import MaskRCNNFPNResNet50  # NOQA
 from chainercv.links.model.fpn.fpn import FPN  # NOQA
-from chainercv.links.model.fpn.head import Head  # NOQA
-from chainercv.links.model.fpn.head import head_loss_post  # NOQA
-from chainercv.links.model.fpn.head import head_loss_pre  # NOQA
+from chainercv.links.model.fpn.mask_head import mask_head_loss_post  # NOQA
+from chainercv.links.model.fpn.mask_head import mask_head_loss_pre  # NOQA
+from chainercv.links.model.fpn.mask_head import MaskHead  # NOQA
+from chainercv.links.model.fpn.mask_utils import mask_to_segm  # NOQA
+from chainercv.links.model.fpn.mask_utils import segm_to_mask  # NOQA
 from chainercv.links.model.fpn.rpn import RPN  # NOQA
 from chainercv.links.model.fpn.rpn import rpn_loss  # NOQA

chainercv/links/model/fpn/head.py → chainercv/links/model/fpn/bbox_head.py

@@ -15,8 +15,8 @@
 from chainercv import utils
 
 
-class Head(chainer.Chain):
-    """Head network of Feature Pyramid Networks.
+class BboxHead(chainer.Chain):
+    """Bounding box head network of Feature Pyramid Networks.
 
     Args:
         n_class (int): The number of classes including background.
@@ -30,7 +30,7 @@ class Head(chainer.Chain):
     std = (0.1, 0.2)
 
     def __init__(self, n_class, scales):
-        super(Head, self).__init__()
+        super(BboxHead, self).__init__()
 
         fc_init = {
             'initialW': Caffe2FCUniform(),
@@ -212,10 +212,10 @@ def decode(self, rois, roi_indices, locs, confs,
         return bboxes, labels, scores
 
 
-def head_loss_pre(rois, roi_indices, std, bboxes, labels):
+def bbox_head_loss_pre(rois, roi_indices, std, bboxes, labels):
     """Loss function for Head (pre).
 
-    This function processes RoIs for :func:`head_loss_post`.
+    This function processes RoIs for :func:`bbox_head_loss_post`.
 
     Args:
         rois (iterable of arrays): An iterable of arrays of
@@ -316,7 +316,8 @@ def head_loss_pre(rois, roi_indices, std, bboxes, labels):
     return rois, roi_indices, gt_locs, gt_labels
 
 
-def head_loss_post(locs, confs, roi_indices, gt_locs, gt_labels, batchsize):
+def bbox_head_loss_post(
+        locs, confs, roi_indices, gt_locs, gt_labels, batchsize):
     """Loss function for Head (post).
 
      Args:
@@ -325,11 +326,11 @@ def head_loss_post(locs, confs, roi_indices, gt_locs, gt_labels, batchsize):
          confs (array): An iterable of arrays whose shape is
              :math:`(R, n\_class)`.
          roi_indices (list of arrays): A list of arrays returned by
-             :func:`head_locs_pre`.
+             :func:`bbox_head_locs_pre`.
          gt_locs (list of arrays): A list of arrays returned by
-             :func:`head_locs_pre`.
+             :func:`bbox_head_locs_pre`.
          gt_labels (list of arrays): A list of arrays returned by
-             :func:`head_locs_pre`.
+             :func:`bbox_head_locs_pre`.
          batchsize (int): The size of batch.
 
      Returns: