From aacec8216ee8182bd56d9f06d9ddc4655d45e15a Mon Sep 17 00:00:00 2001 From: Ray2020BD <563755780@qq.com> Date: Fri, 2 Apr 2021 17:07:47 +0800 Subject: [PATCH 1/2] fix test of affine_grid with rocm --- python/paddle/fluid/tests/unittests/test_affine_grid_op.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/paddle/fluid/tests/unittests/test_affine_grid_op.py b/python/paddle/fluid/tests/unittests/test_affine_grid_op.py index e4336ab05d58f7..728b83c2cc8683 100644 --- a/python/paddle/fluid/tests/unittests/test_affine_grid_op.py +++ b/python/paddle/fluid/tests/unittests/test_affine_grid_op.py @@ -83,6 +83,8 @@ def initTestCase(self): self.output_shape = np.array([20, 2, 5, 7]).astype("int32") self.dynamic_shape = True self.use_cudnn = True + if paddle.fluid.core.is_compiled_with_rocm(): + self.use_cudnn = False # Current cudnn is not supported in this op with rocm self.align_corners = True From c9139b92fc07157fc2c73a38cfc6873a4f59fa17 Mon Sep 17 00:00:00 2001 From: Ray2020BD <563755780@qq.com> Date: Fri, 2 Apr 2021 18:02:21 +0800 Subject: [PATCH 2/2] fix test of affine_grid with rocm --- python/paddle/fluid/layers/nn.py | 3 +++ python/paddle/fluid/tests/unittests/test_affine_grid_op.py | 2 +- python/paddle/nn/functional/vision.py | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py index 6bc69ffd5cd324..34dc1e9b346ecb 100755 --- a/python/paddle/fluid/layers/nn.py +++ b/python/paddle/fluid/layers/nn.py @@ -9260,6 +9260,9 @@ def affine_grid(theta, out_shape, name=None): 'affine_grid') else: attrs['output_shape'] = out_shape + if core.is_compiled_with_rocm(): + # ROCM platform do not have MIOPEN kernel for affine_grid + attrs['use_cudnn'] = False helper.append_op( type='affine_grid', diff --git a/python/paddle/fluid/tests/unittests/test_affine_grid_op.py b/python/paddle/fluid/tests/unittests/test_affine_grid_op.py index 728b83c2cc8683..8277256009e72b 100644 --- a/python/paddle/fluid/tests/unittests/test_affine_grid_op.py +++ b/python/paddle/fluid/tests/unittests/test_affine_grid_op.py @@ -84,7 +84,7 @@ def initTestCase(self): self.dynamic_shape = True self.use_cudnn = True if paddle.fluid.core.is_compiled_with_rocm(): - self.use_cudnn = False # Current cudnn is not supported in this op with rocm + self.use_cudnn = False # ROCM platform do not have MIOPEN kernel for affine_grid self.align_corners = True diff --git a/python/paddle/nn/functional/vision.py b/python/paddle/nn/functional/vision.py index 9e04095e7b7988..032d5b47eda077 100644 --- a/python/paddle/nn/functional/vision.py +++ b/python/paddle/nn/functional/vision.py @@ -119,6 +119,8 @@ def affine_grid(theta, out_shape, align_corners=True, name=None): use_cudnn = True else: use_cudnn = False + if core.is_compiled_with_rocm(): + use_cudnn = False # ROCM platform do not have MIOPEN kernel for affine_grid if not (isinstance(out_shape, list) or isinstance(out_shape, tuple) or \ isinstance(out_shape, Variable)):