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

mkldnn layout issue fix #39422

Merged
merged 2 commits into from
Feb 10, 2022
Merged

mkldnn layout issue fix #39422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71a6a90
mkldnn conv fix
b3602sss Feb 9, 2022
6722798
definetion
b3602sss Feb 9, 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
27 changes: 27 additions & 0 deletions paddle/fluid/inference/api/details/zero_copy_tensor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,33 @@ std::vector<int> Tensor::shape() const {
PADDLE_ENFORCE_NOT_NULL(
tensor_, paddle::platform::errors::PreconditionNotMet(
"Not found tensor called %s in the scope", name_));
// mkldnn may does layout transform internally, so need to reorder before
// return
#ifdef PADDLE_WITH_MKLDNN
if (tensor->layout() == paddle::framework::DataLayout::kMKLDNN) {
paddle::framework::DataLayout out_layout =
paddle::platform::MKLDNNDeviceContext::tls()
.get_cur_paddle_data_layout();
// Set default as NCHW in case not specified
out_layout = out_layout == paddle::framework::DataLayout::kAnyLayout
? paddle::framework::DataLayout::kNCHW
: out_layout;
// In these data layouts, channel dimension is either on 2nd position: nChw
// or
// at last nhwC, so for dim==2 these layouts are the same and nothing should
// be done. Similarly for dim==1 when you have just one possible
// combination.
if (tensor->dims().size() < 3)
return paddle::framework::vectorize<int>(tensor->dims());
if (out_layout == paddle::framework::DataLayout::kNHWC) {
auto dims = paddle::framework::vectorize<int>(tensor->dims());
std::rotate(dims.begin() + 1, dims.begin() + 2, dims.end());
return dims;
} else {
return paddle::framework::vectorize<int>(tensor->dims());
}
}
#endif
return paddle::framework::vectorize<int>(tensor->dims());
}

Expand Down
4 changes: 3 additions & 1 deletion python/paddle/fluid/tests/unittests/ir/inference/test_conv_bn_fuse_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ def sample_predictor_configs(self, program_config):

def add_ignore_pass_case(self):
def teller1(program_config, predictor_config):
if program_config.ops[0].attrs['data_format'] == "NHWC":
if program_config.ops[0].attrs[
'data_format'] == "NHWC" and not predictor_config.mkldnn_enabled(
):
return True
return False

Expand Down