Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dy2St] transforms.Resize Support static mode #49008

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 92 additions & 0 deletions python/paddle/tests/test_transforms_static.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import unittest

import numpy as np

import paddle
from paddle.vision.transforms import transforms

SEED = 2022


class TestTransformUnitTestBase(unittest.TestCase):
def setUp(self):
self.img = (np.random.rand(*self.get_shape()) * 255.0).astype(
np.float32
)
self.set_trans_api()

def get_shape(self):
return (64, 64, 3)

def set_trans_api(self):
self.api = transforms.Resize(size=16)

def dynamic_transform(self):
paddle.seed(SEED)

img_t = paddle.to_tensor(self.img)
return self.api(img_t)

def static_transform(self):
paddle.enable_static()
paddle.seed(SEED)

main_program = paddle.static.Program()
with paddle.static.program_guard(main_program):
x = paddle.static.data(
shape=self.get_shape(), dtype=paddle.float32, name='img'
)
out = self.api(x)

exe = paddle.static.Executor()
res = exe.run(main_program, fetch_list=[out], feed={'img': self.img})

paddle.disable_static()
return res[0]

def test_transform(self):
dy_res = self.dynamic_transform()
st_res = self.static_transform()

np.testing.assert_almost_equal(dy_res, st_res)


class TestResize(TestTransformUnitTestBase):
def set_trans_api(self):
self.api = transforms.Resize(size=(16, 16))


class TestResizeError(TestTransformUnitTestBase):
def test_transform(self):
pass

def test_error(self):
paddle.enable_static()
# Not support while w<=0 or h<=0, but received w=-1, h=-1
with self.assertRaises(NotImplementedError):
main_program = paddle.static.Program()
with paddle.static.program_guard(main_program):
x = paddle.static.data(
shape=[-1, -1, -1], dtype=paddle.float32, name='img'
)
self.api(x)

paddle.disable_static()


if __name__ == "__main__":
unittest.main()
6 changes: 5 additions & 1 deletion python/paddle/vision/transforms/functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import paddle

from ...fluid.framework import Variable
from . import functional_cv2 as F_cv2
from . import functional_pil as F_pil
from . import functional_tensor as F_t
Expand All @@ -32,7 +33,10 @@ def _is_pil_image(img):


def _is_tensor_image(img):
return isinstance(img, paddle.Tensor)
"""
Return True if img is a Tensor for dynamic mode or Variable for static mode.
"""
return isinstance(img, (paddle.Tensor, Variable))


def _is_numpy_image(img):
Expand Down
12 changes: 11 additions & 1 deletion python/paddle/vision/transforms/functional_tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
import paddle
import paddle.nn.functional as F

from ...fluid.framework import Variable

__all__ = []


def _assert_image_tensor(img, data_format):
if (
not isinstance(img, paddle.Tensor)
not isinstance(img, (paddle.Tensor, Variable))
or img.ndim < 3
or img.ndim > 4
or not data_format.lower() in ('chw', 'hwc')
Expand Down Expand Up @@ -725,6 +727,14 @@ def resize(img, size, interpolation='bilinear', data_format='CHW'):

if isinstance(size, int):
w, h = _get_image_size(img, data_format)
# TODO(Aurelius84): In static mode, w and h will be -1 for dynamic shape.
# We should consider to support this case in future.
if w <= 0 or h <= 0:
raise NotImplementedError(
"Not support while w<=0 or h<=0, but received w={}, h={}".format(
w, h
)
)
if (w <= h and w == size) or (h <= w and h == size):
return img
if w < h:
Expand Down