Skip to content

Fix the bug of test_conv2d_int8_mkldnn case which raised by improper parameter passing #17058

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
luotao1 merged 2 commits into from
Apr 24, 2019
Merged

Fix the bug of test_conv2d_int8_mkldnn case which raised by improper parameter passing #17058

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c4800
resolve #17057
guomingz Apr 23, 2019
5a07fdd
Fix the bug of test_conv2d_int8_mkldnn case which raised by improper …
guomingz Apr 23, 2019
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
21 changes: 10 additions & 11 deletions python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_int8_mkldnn_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,25 +102,26 @@ def setUp(self):
output1 = conv2d_forward_refer(
input.astype(np.int32), filter_int, self.groups,
conv2d_param).astype(np.float32)
output1_tmp = np.round(output1 * (
self.scale_out / (self.scale_in * self.scale_weights[0])))

if self.fuse_residual:
input_residual = np.random.randint(
0, 10, self.input_residual_size).astype(self.srctype)
output_tmp = np.round(output1 * (self.scale_out / (
output_tmp_res = np.round(output1 * (self.scale_out / (
self.scale_in * self.scale_weights[0])) + format_reorder(
input_residual, self.input_residual_size).astype(
np.int32) * (self.scale_out / self.scale_in_eltwise
))
output_tmp2 = np.round(output1 * (
self.scale_out / (self.scale_in * self.scale_weights[0])))
if self.fuse_relu:
output = np.maximum(output_tmp, 0).astype(self.dsttype)
output = np.maximum(output_tmp_res, 0).astype(self.dsttype)
else:
output = output_tmp.astype(self.dsttype)
output = output_tmp_res.astype(self.dsttype)
else:
if self.fuse_relu:
output = np.maximum(output_tmp2, 0).astype(self.dsttype)
output = np.maximum(output1_tmp, 0).astype(self.dsttype)
else:
output = output_tmp2.astype(self.dsttype)
output = output1_tmp.astype(self.dsttype)

self.inputs = {
'Input':
Expand Down Expand Up @@ -265,11 +266,9 @@ def init_data_type_with_fusion(self, input_dt, fuse_relu, fuse_residual):
self.srctype = input_dt
self.dsttype = np.uint8 if fuse_relu else np.int8

def init_fuse_relu(self):
self.fuse_relu = fuse_relu
self.fuse_relu = fuse_relu

def init_fuse_residual(self):
self.fuse_residual = fuse_residual
self.fuse_residual = fuse_residual


def create_test_int8_class(parent):
Expand Down