Эх сурвалжийг харах

fix resize about w,h order (#2132)

Tingquan Gao 1 жил өмнө
parent
commit
2c71546c0a

+ 1 - 1
paddlex/inference/components/paddle_predictor/predictor.py

@@ -209,7 +209,7 @@ class ImageDetPredictor(BasePaddlePredictor):
                 np.stack(scale_factors, axis=0).astype(dtype=np.float32, copy=False),
                 np.stack(scale_factors, axis=0).astype(dtype=np.float32, copy=False),
             ]
             ]
         else:
         else:
-            # img_size = [img_size[::-1] for img_size in img_size]
+            img_size = [img_size[::-1] for img_size in img_size]
             return [
             return [
                 np.stack(img_size, axis=0).astype(dtype=np.float32, copy=False),
                 np.stack(img_size, axis=0).astype(dtype=np.float32, copy=False),
                 np.stack(img, axis=0).astype(dtype=np.float32, copy=False),
                 np.stack(img, axis=0).astype(dtype=np.float32, copy=False),

+ 3 - 3
paddlex/inference/components/transforms/image/common.py

@@ -331,11 +331,11 @@ class Resize(_BaseResize):
     def apply(self, img):
     def apply(self, img):
         """apply"""
         """apply"""
         target_size = self.target_size
         target_size = self.target_size
-        original_size = img.shape[:2]
+        original_size = img.shape[:2][::-1]
 
 
         if self.keep_ratio:
         if self.keep_ratio:
             h, w = img.shape[0:2]
             h, w = img.shape[0:2]
-            target_size, _ = self._rescale_size((h, w), self.target_size)
+            target_size, _ = self._rescale_size((w, h), self.target_size)
 
 
         if self.size_divisor:
         if self.size_divisor:
             target_size = [
             target_size = [
@@ -344,8 +344,8 @@ class Resize(_BaseResize):
             ]
             ]
 
 
         img_scale_w, img_scale_h = [
         img_scale_w, img_scale_h = [
-            target_size[1] / original_size[1],
             target_size[0] / original_size[0],
             target_size[0] / original_size[0],
+            target_size[1] / original_size[1],
         ]
         ]
         img = F.resize(img, target_size, interp=self.interp)
         img = F.resize(img, target_size, interp=self.interp)
         return {
         return {