Skip to content

Fix the dimension of padding to match the input's dimension #125

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

Merged
merged 1 commit into from
Sep 29, 2022
Merged

Fix the dimension of padding to match the input's dimension #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions aten/src/ATen/native/mps/operations/Pad.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,23 +107,20 @@
grad_output = grad_output_.contiguous();
}

const int64_t input_dim = input.dim();
MPSShape *leftPadding = nullptr, *rightPadding = nullptr;
if (padding_dim == 3) {
leftPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(0), @(0), @(pad_front), @(pad_t), @(pad_l) } count:input_dim];
rightPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(0), @(0), @(pad_back), @(pad_b), @(pad_r) } count:input_dim];
} else if (padding_dim == 2) {
leftPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(0), @(0), @(pad_t), @(pad_l) } count:input_dim];
rightPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(0), @(0), @(pad_b), @(pad_r) } count:input_dim];
} else if (padding_dim == 1) {
if (input_dim > 1) {
leftPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(0), @(0), @(pad_l) } count:input_dim];
rightPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(0), @(0), @(pad_r) } count:input_dim];
} else {
leftPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(pad_l) } count:input_dim];
rightPadding = [NSArray arrayWithObjects:(const NSNumber*[]){ @(pad_r) } count:input_dim];
}
std::vector<NSNumber*> leftPadVec(ndims, @(0));
std::vector<NSNumber*> rightPadVec(ndims, @(0));
leftPadVec [ndims - 1] = @(pad_l);
rightPadVec[ndims - 1] = @(pad_r);
if (padding_dim >= 2) {
leftPadVec [ndims - 2] = @(pad_t);
rightPadVec[ndims - 2] = @(pad_b);
}
if (padding_dim >= 3) {
leftPadVec [ndims - 3] = @(pad_front);
rightPadVec[ndims - 3] = @(pad_back);
}
MPSShape *leftPadding = [NSArray arrayWithObjects:leftPadVec.data() count:ndims];
MPSShape *rightPadding = [NSArray arrayWithObjects:rightPadVec.data() count:ndims];

struct CachedGraph : public MPSCachedGraph {
CachedGraph(MPSGraph *graph) : MPSCachedGraph(graph) { }
Expand Down
2 changes: 2 additions & 0 deletions test/test_mps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3482,6 +3482,8 @@ def helper(shape, padding, op, value=0):
helper((2, 1, 6, 8), (2, 4, 3, 5), nn.ReplicationPad2d)
# Constant Pad 2D
helper((2, 1, 6, 8), (2, 4, 3, 5), nn.ConstantPad2d)
# input size < pad size
helper((1, 2, 3), (0, 0, 0, 1), nn.ConstantPad2d)

# 3D Padding
helper((2, 4, 6, 8, 4), (1, 3, 3, 5, 3, 4), nn.ReflectionPad3d)
Expand Down