Address warnings from Numpy 1.11.1 upgrade

nancynwei · Sep 14, 2016 · e0c73b6 · e0c73b6
1 parent 49206e9
commit e0c73b6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/neon/data/pascal_voc.py b/neon/data/pascal_voc.py
@@ -877,7 +877,7 @@ def __iter__(self):
                 self.last_im_height = im_shape[1]
                 self.last_im_width = im_shape[0]
 
-                im_shape *= im_scale
+                im_shape = (im_shape * im_scale).astype(int)
                 im = im.resize(im_shape, Image.LINEAR)
                 im = np.array(im)[:, :, ::-1]
                 # Mean subtract and scale an image
@@ -1085,8 +1085,8 @@ def correct_bbox(self, boxes, box_deltas, im_height, im_width):
 
         dx = box_deltas[:, BB_XMIN_IDX::4]
         dy = box_deltas[:, BB_YMIN_IDX::4]
-        dw = box_deltas[:, BB_XMAX_IDX::4]
-        dh = box_deltas[:, BB_YMAX_IDX::4]
+        dw = box_deltas[:, BB_XMAX_IDX::4].astype(np.longfloat)
+        dh = box_deltas[:, BB_YMAX_IDX::4].astype(np.longfloat)
 
         pred_ctr_x = dx * widths[:, np.newaxis] + ctr_x[:, np.newaxis]
         pred_ctr_y = dy * heights[:, np.newaxis] + ctr_y[:, np.newaxis]
@@ -1355,7 +1355,7 @@ def _get_bbox_regression_labels(bbox_target_data, num_classes):
     bbox_loss_weights = np.zeros(bbox_targets.shape, dtype=np.float32)
     inds = np.where(clss > 0)[0]
     for ind in inds:
-        cls = clss[ind]
+        cls = clss[ind].astype(int)
         start = 4 * cls
         end = start + 4
         bbox_targets[ind, start:end] = bbox_target_data[ind, 1:]