Add Position Sensitive ROI Align functions

chainercv/experimental/links/model/fcis/fcis_resnet101.py

@@ -6,7 +6,7 @@
 import numpy as np
 
 from chainercv.experimental.links.model.fcis import FCIS
-from chainercv.functions import psroi_pooling_2d
+from chainercv.functions import ps_roi_average_pooling_2d
 from chainercv.links import Conv2DBNActiv
 from chainercv.links.model.faster_rcnn.region_proposal_network import \
     RegionProposalNetwork
@@ -365,7 +365,7 @@ def _pool(
             self, h_cls_seg, h_ag_loc, rois, roi_indices, gt_roi_labels):
         # PSROI Pooling
         # shape: (n_roi, n_class, 2, roi_size, roi_size)
-        roi_cls_ag_seg_scores = psroi_pooling_2d(
+        roi_cls_ag_seg_scores = ps_roi_average_pooling_2d(
             h_cls_seg, rois, roi_indices,
             self.n_class * 2, self.roi_size, self.roi_size,
             self.spatial_scale, self.group_size)
@@ -374,7 +374,7 @@ def _pool(
             (-1, self.n_class, 2, self.roi_size, self.roi_size))
 
         # shape: (n_roi, 2*4, roi_size, roi_size)
-        roi_ag_loc_scores = psroi_pooling_2d(
+        roi_ag_loc_scores = ps_roi_average_pooling_2d(
             h_ag_loc, rois, roi_indices,
             2 * 4, self.roi_size, self.roi_size,
             self.spatial_scale, self.group_size)

chainercv/functions/__init__.py

@@ -1,2 +1,3 @@
-from chainercv.functions.psroi_pooling_2d import psroi_pooling_2d  # NOQA
-from chainercv.functions.psroi_pooling_2d import PSROIPooling2D  # NOQA
+from chainercv.functions.ps_roi_average_align_2d import ps_roi_average_align_2d  # NOQA
+from chainercv.functions.ps_roi_average_pooling_2d import ps_roi_average_pooling_2d  # NOQA
+from chainercv.functions.ps_roi_max_align_2d import ps_roi_max_align_2d  # NOQA