CI fix

Author: jakpiase

paddle/fluid/framework/data_layout_transform.cc

@@ -143,7 +143,7 @@ void TransDataLayoutFromMKLDNN(const OpKernelType& kernel_type_for_var,
 
 void innerTransDataLayoutFromMKLDNN(DataLayout in_layout, DataLayout out_layout,
                                     const Tensor& in, Tensor* out,
-                                    platform::Place place) {
+                                    platform::Place place, bool always_copy) {
   PADDLE_ENFORCE_NE(in.format(), MKLDNNMemoryFormat::undef,
                     platform::errors::InvalidArgument(
                         "Input tensor format is invalid. Input tensor should "
@@ -177,7 +177,7 @@ void innerTransDataLayoutFromMKLDNN(DataLayout in_layout, DataLayout out_layout,
   // output tensor has the same dims as input. Reorder don't change dims
   out->Resize(in.dims());
 
-  if (in_format != out_format) {
+  if ((in_format != out_format) || always_copy) {
     void* in_data = GetDataFromTensor(in, in_type);
     std::string key =
         platform::CreateKey(*dev_ctx, in_tz, in_format, out_format, in_type);

paddle/fluid/framework/data_layout_transform.h

@@ -78,7 +78,8 @@ inline MKLDNNDataType ToMKLDNNDataType(proto::VarType::Type type) {
 
 void innerTransDataLayoutFromMKLDNN(DataLayout in_layout, DataLayout out_layout,
                                     const Tensor& in, Tensor* out,
-                                    platform::Place place);
+                                    platform::Place place,
+                                    bool always_copy = false);
 
 void TransDataLayoutFromMKLDNN(const OpKernelType& kernel_type_for_var,
                                const OpKernelType& expected_kernel_type,

paddle/fluid/inference/api/details/zero_copy_tensor.cc

@@ -174,7 +174,7 @@ void Tensor::CopyToCpu(T *data) {
       paddle::framework::innerTransDataLayoutFromMKLDNN(
           tensor->layout(), paddle::platform::MKLDNNDeviceContext::tls()
                                 .get_cur_paddle_data_layout(),
-          *tensor, &out, paddle::platform::CPUPlace());
+          *tensor, &out, paddle::platform::CPUPlace(), true);
     else
       std::memcpy(static_cast<void *>(data), t_data, ele_num * sizeof(T));
 #else

paddle/fluid/operators/scale_op.cc

@@ -130,7 +130,7 @@ class ScaleGradMaker : public framework::SingleGradOpMaker<T> {
     grad_op->SetAttr("scale", this->GetAttr("scale"));
     grad_op->SetAttr("bias", 0.0f);
     grad_op->SetAttr("bias_after_scale", true);
-    if(grad_op->HasAttr("use_mkldnn"))
+    if (grad_op->HasAttr("use_mkldnn"))
       grad_op->SetAttr("use_mkldnn", this->GetAttr("use_mkldnn"));
   }
 };