fix gridmask (#2695)

Author: jerrywgz

ppdet/data/transform/gridmask_utils.py

@@ -45,8 +45,7 @@ def __call__(self, x, curr_iter):
         self.prob = self.st_prob * min(1, 1.0 * curr_iter / self.upper_iter)
         if np.random.rand() > self.prob:
             return x
-        # image should be C, H, W format
-        _, h, w = x.shape
+        h, w, _ = x.shape
         hh = int(1.5 * h)
         ww = int(1.5 * w)
         d = np.random.randint(2, h)
@@ -74,7 +73,7 @@ def __call__(self, x, curr_iter):
 
         if self.mode == 1:
             mask = 1 - mask
-        mask = np.expand_dims(mask, axis=0)
+        mask = np.expand_dims(mask, axis=-1)
         if self.offset:
             offset = (2 * (np.random.rand(h, w) - 0.5)).astype(np.float32)
             x = (x * mask + offset * (1 - mask)).astype(x.dtype)

static/ppdet/data/transform/gridmask_utils.py

@@ -46,7 +46,7 @@ def __call__(self, x, curr_iter):
         if np.random.rand() > self.prob:
             return x
         # image should be C, H, W format
-        _, h, w = x.shape
+        h, w, _ = x.shape
         hh = int(1.5 * h)
         ww = int(1.5 * w)
         d = np.random.randint(2, h)
@@ -74,7 +74,7 @@ def __call__(self, x, curr_iter):
 
         if self.mode == 1:
             mask = 1 - mask
-        mask = np.expand_dims(mask, axis=0)
+        mask = np.expand_dims(mask, axis=-1)
         if self.offset:
             offset = (2 * (np.random.rand(h, w) - 0.5)).astype(np.float32)
             x = (x * mask + offset * (1 - mask)).astype(x.dtype)