diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py index 9ac314528dc1f1..aa021c463bf3d7 100755 --- a/python/paddle/fluid/layers/nn.py +++ b/python/paddle/fluid/layers/nn.py @@ -13029,7 +13029,10 @@ def grid_sampler(x, grid, name=None): out = helper.create_variable_for_type_inference(x.dtype) ipts = {'X': x, 'Grid': grid} - helper.append_op(type='grid_sampler', inputs=ipts, outputs={'Output': out}) + attrs = {'use_cudnn': False} if core.is_compiled_with_rocm() else {} + + helper.append_op( + type='grid_sampler', inputs=ipts, outputs={'Output': out}, attrs=attrs) return out diff --git a/python/paddle/fluid/tests/unittests/test_grid_sampler_op.py b/python/paddle/fluid/tests/unittests/test_grid_sampler_op.py index bf2f9518fb0c72..d5056bd11cf084 100644 --- a/python/paddle/fluid/tests/unittests/test_grid_sampler_op.py +++ b/python/paddle/fluid/tests/unittests/test_grid_sampler_op.py @@ -14,6 +14,7 @@ import unittest import numpy as np +import paddle.fluid.core as core from op_test import OpTest @@ -182,7 +183,7 @@ def initTestCase(self): self.align_corners = True self.padding_mode = "zeros" self.mode = "bilinear" - self.use_cudnn = True + self.use_cudnn = False if core.is_compiled_with_rocm() else True class Case1(TestGridSamplerOp): diff --git a/python/paddle/fluid/tests/unittests/test_inplace_abn_op.py b/python/paddle/fluid/tests/unittests/test_inplace_abn_op.py index 7b92f6f02c6db2..077496200d988f 100644 --- a/python/paddle/fluid/tests/unittests/test_inplace_abn_op.py +++ b/python/paddle/fluid/tests/unittests/test_inplace_abn_op.py @@ -27,7 +27,7 @@ class TestInplaceANBOpTraining(unittest.TestCase): def setUp(self): - self.dtype = np.float64 + self.dtype = np.float32 if core.is_compiled_with_rocm() else np.float64 self.N = 4 self.C = 5 self.H = 7 diff --git a/python/paddle/nn/functional/vision.py b/python/paddle/nn/functional/vision.py index 55a66e70160b6c..a2218a6e1aa69b 100644 --- a/python/paddle/nn/functional/vision.py +++ b/python/paddle/nn/functional/vision.py @@ -265,8 +265,9 @@ def grid_sample(x, cudnn_version = get_cudnn_version() use_cudnn = False - if (cudnn_version is not None - ) and align_corners and mode == 'bilinear' and padding_mode == 'zeros': + if not core.is_compiled_with_rocm() and ( + cudnn_version is not None + ) and align_corners and mode == 'bilinear' and padding_mode == 'zeros': use_cudnn = True # CUDNN always computes gradients for all inputs x.stop_gradient = False