From d8181ab958f090b33d621c59632aa2f00250bd22 Mon Sep 17 00:00:00 2001
From: Haihao Shen <haihao.shen@intel.com>
Date: Fri, 9 Nov 2018 10:58:03 +0800
Subject: [PATCH] Skip s8u8 when force fp32

---
 paddle/fluid/operators/conv_mkldnn_op.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paddle/fluid/operators/conv_mkldnn_op.cc b/paddle/fluid/operators/conv_mkldnn_op.cc
index aa99658acc0..e9c2deb6ba5 100644
--- a/paddle/fluid/operators/conv_mkldnn_op.cc
+++ b/paddle/fluid/operators/conv_mkldnn_op.cc
@@ -785,7 +785,7 @@ class ConvMKLDNNOpKernel : public paddle::framework::OpKernel<T> {
     pipeline.push_back(*conv_p);
     stream(stream::kind::eager).submit(pipeline).wait();
 
-    if(need_s8_to_u8){
+    if(need_s8_to_u8 && !force_fp32_output){
         output->mutable_data<uint8_t>(ctx.GetPlace());
     }
 
-- 
GitLab