Reopen #46 : Add assertion to block usage multi-scale mode with training phase

lib/fast_rcnn/test.py

@@ -133,7 +133,7 @@ def _rescale_boxes(boxes, inds, scales):
 def im_detect(sess, net, im, boxes=None):
     """Detect object classes in an image given object proposals.
     Arguments:
-        net (caffe.Net): Fast R-CNN network to use
+        net (tensorflow graph): Fast or faster R-CNN network to use
         im (ndarray): color image to test (in BGR order)
         boxes (ndarray): R x 4 array of object proposals
     Returns:

lib/fast_rcnn/train.py

@@ -202,15 +202,8 @@ def get_training_roidb(imdb):
 
 def get_data_layer(roidb, num_classes):
     """return a data layer."""
-    if cfg.TRAIN.HAS_RPN:
-        if cfg.IS_MULTISCALE:
-            layer = GtDataLayer(roidb)
-        else:
-            layer = RoIDataLayer(roidb, num_classes)
-    else:
-        layer = RoIDataLayer(roidb, num_classes)
-
-    return layer
+    assert not (cfg.TRAIN.HAS_RPN and cfg.IS_MULTISCALE), 'Multiscale mode is unimplemented with using RPN'
+    return RoIDataLayer(roidb, num_classes)
 
 
 def train_net(network, imdb, roidb, output_dir, pretrained_model=None, max_iters=40000):

lib/roi_data_layer/layer.py

@@ -5,9 +5,7 @@
 # Written by Ross Girshick
 # --------------------------------------------------------
 
-"""The data layer used during training to train a Fast R-CNN network.
-
-RoIDataLayer implements a Caffe Python layer.
+"""The data layer used during training to train a Fast or faster R-CNN network.
 """
 
 from fast_rcnn.config import cfg