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.

Sign up for GitHub

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

Jump to bottom

R2.3/fix pad3d infer shape #42414

Merged
merged 7 commits into from
Apr 30, 2022
Merged

R2.3/fix pad3d infer shape #42414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f25ac0
fix pad3d infer shape
littletomatodonkey Apr 13, 2022
f1331e9
fix pad3d
littletomatodonkey Apr 13, 2022
06f50ee
fix pad default value
littletomatodonkey Apr 13, 2022
6cfe7c2
fix order
littletomatodonkey Apr 13, 2022
b48a79b
add unit test
littletomatodonkey Apr 18, 2022
ee60693
fix unittest for ci coverage
littletomatodonkey Apr 18, 2022
9a3db8a
add ndhwc check
littletomatodonkey Apr 19, 2022
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
30 changes: 18 additions & 12 deletions paddle/phi/infermeta/unary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,32 +1277,40 @@ void Pad3dInferMeta(const MetaTensor& x,
"5, but received %d. ",
x_dim.size()));

std::vector<int64_t> out_dims(x_dim.size());
std::vector<int64_t> out_dims(x_dim.size(), -1);
out_dims[0] = x_dim[0];
auto& paddings = paddings_int_array.GetData();
if (data_format == "NCDHW") {
out_dims[1] = x_dim[1];
} else {
out_dims[4] = x_dim[4];
}
if (paddings_int_array.FromTensor()) {
if (config.is_runtime) {
PADDLE_ENFORCE_EQ(
paddings_int_array.GetData().size(),
paddings.size(),
6,
errors::InvalidArgument("Shape of Input(Paddings) should be equal to "
"[6], but received [%d].",
paddings_int_array.GetData().size()));
paddings.size()));
if (data_format == "NCDHW") {
out_dims[2] = x_dim[2] + paddings[4] + paddings[5];
out_dims[3] = x_dim[3] + paddings[2] + paddings[3];
out_dims[4] = x_dim[4] + paddings[0] + paddings[1];
} else {
out_dims[1] = x_dim[1] + paddings[4] + paddings[5];
out_dims[2] = x_dim[2] + paddings[2] + paddings[3];
out_dims[3] = x_dim[3] + paddings[0] + paddings[1];
}
}
out_dims[1] = x_dim[1];
out_dims[2] = x_dim[2];
out_dims[3] = x_dim[3];
out_dims[4] = x_dim[4];
} else {
auto paddings = paddings_int_array.GetData();

PADDLE_ENFORCE_EQ(
paddings.size(),
6,
errors::InvalidArgument(
"Size of paddings should be equal to 6, but received %d.",
static_cast<int>(paddings.size())));
if (data_format == "NCDHW") {
out_dims[1] = x_dim[1]; // channel
out_dims[2] = ((!config.is_runtime) && (x_dim[2] < 0))
? x_dim[2]
: (x_dim[2] + paddings[4] + paddings[5]); // depth
Expand All @@ -1315,8 +1323,6 @@ void Pad3dInferMeta(const MetaTensor& x,
? x_dim[4]
: (x_dim[4] + paddings[0] + paddings[1]); // width
} else { // NDHWC
out_dims[4] = x_dim[4]; // channel

out_dims[1] = ((!config.is_runtime) && (x_dim[1] < 0))
? x_dim[1]
: (x_dim[1] + paddings[4] + paddings[5]); // depth
Expand Down
54 changes: 53 additions & 1 deletion python/paddle/fluid/tests/unittests/test_pad3d_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class TestPad3dOp(OpTest):
def setUp(self):
paddle.enable_static()
self.value = 0.0
self.variable_paddings = False
self.initTestCase()
self.op_type = "pad3d"
self.python_api = paddle.nn.functional.pad
Expand Down Expand Up @@ -84,6 +83,7 @@ def initTestCase(self):
self.mode = "constant"
self.data_format = "NCDHW"
self.pad_value = 0.0
self.variable_paddings = False


class TestCase1(TestPad3dOp):
Expand All @@ -93,6 +93,7 @@ def initTestCase(self):
self.mode = "constant"
self.data_format = "NCDHW"
self.value = 1.0
self.variable_paddings = False


class TestCase2(TestPad3dOp):
Expand All @@ -102,6 +103,7 @@ def initTestCase(self):
self.mode = "constant"
self.data_format = "NDHWC"
self.value = 1.0
self.variable_paddings = False


class TestCase3(TestPad3dOp):
Expand All @@ -110,6 +112,7 @@ def initTestCase(self):
self.paddings = [0, 1, 1, 0, 2, 3]
self.mode = "reflect"
self.data_format = "NCDHW"
self.variable_paddings = False


class TestCase4(TestPad3dOp):
Expand All @@ -118,6 +121,7 @@ def initTestCase(self):
self.paddings = [0, 1, 2, 1, 2, 3]
self.mode = "reflect"
self.data_format = "NDHWC"
self.variable_paddings = False


class TestCase5(TestPad3dOp):
Expand All @@ -126,6 +130,7 @@ def initTestCase(self):
self.paddings = [0, 1, 2, 3, 2, 1]
self.mode = "replicate"
self.data_format = "NCDHW"
self.variable_paddings = False


class TestCase6(TestPad3dOp):
Expand All @@ -134,6 +139,7 @@ def initTestCase(self):
self.paddings = [5, 4, 2, 1, 2, 3]
self.mode = "replicate"
self.data_format = "NDHWC"
self.variable_paddings = False


class TestCase7(TestPad3dOp):
Expand All @@ -142,6 +148,7 @@ def initTestCase(self):
self.paddings = [0, 1, 2, 3, 2, 1]
self.mode = "circular"
self.data_format = "NCDHW"
self.variable_paddings = False


class TestCase8(TestPad3dOp):
Expand All @@ -150,6 +157,27 @@ def initTestCase(self):
self.paddings = [0, 1, 2, 1, 2, 3]
self.mode = "circular"
self.data_format = "NDHWC"
self.variable_paddings = False


class TestCase9(TestPad3dOp):
def initTestCase(self):
self.shape = (2, 3, 4, 5, 6)
self.paddings = [0, 1, 2, 3, 4, 5]
self.mode = "constant"
self.data_format = "NCDHW"
self.value = 1.0
self.variable_paddings = True


class TestCase10(TestPad3dOp):
def initTestCase(self):
self.shape = (2, 3, 4, 5, 6)
self.paddings = [0, 1, 2, 3, 4, 5]
self.mode = "constant"
self.data_format = "NDHWC"
self.value = 1.0
self.variable_paddings = True


class TestPadAPI(unittest.TestCase):
Expand Down Expand Up @@ -681,6 +709,30 @@ def test_class(self):
input_data, pad, "circular", data_format="NCDHW")
self.assertTrue(np.allclose(output.numpy(), np_out))

def test_pad_tensor(self):
paddle.disable_static()
for place in self.places:
input_shape = (3, 4, 5, 6, 7)
pad = [1, 2, 2, 1, 1, 0]
pad_tensor = paddle.to_tensor(pad)
input_data = np.random.rand(*input_shape).astype(np.float32)

pad_reflection_ncdhw = nn.Pad3D(
padding=pad_tensor, mode="reflect", data_format="NCDHW")
pad_reflection_ndhwc = nn.Pad3D(
padding=pad_tensor, mode="reflect", data_format="NDHWC")
data = paddle.to_tensor(input_data)

output = pad_reflection_ncdhw(data)
np_out = self._get_numpy_out(
input_data, pad, "reflect", data_format="NCDHW")
self.assertTrue(np.allclose(output.numpy(), np_out))

output = pad_reflection_ndhwc(data)
np_out = self._get_numpy_out(
input_data, pad, "reflect", data_format="NDHWC")
self.assertTrue(np.allclose(output.numpy(), np_out))


class TestPad3dOpError(unittest.TestCase):
def setUp(self):
Expand Down