remove some unuse lines

Author: XiaobingSuper

torch_ipex/csrc/cpu/dbl/Common.cpp

@@ -36,13 +36,10 @@ dil::tensor dil_tensor_from_cpu_buffer(const at::Tensor& tensor, dil::deleter_pt
 
 dil::tensor dil_tensor_from_dil_buffer(const at::Tensor& tensor) {
   auto dil_buffer = cpu::ShadeDataContext::getDilStorage(tensor);
-  // for low prcision, x.reshape() + linear, has some issue, need return dil_buffer directly
-  //return dil_buffer;
-
-  if (dil_buffer.is_public_format()) {
+  auto data_type = dil_buffer.get_data_type();
+  if (dil_buffer.is_public_format() && !(data_type == dil::data_type::s8 || data_type == dil::data_type::u8)) {
     auto size = tensor.sizes().vec();
     auto stride = tensor.strides().vec();
-    auto data_type = dil_buffer.get_data_type();
     auto data_ptr = static_cast<void *>(
         static_cast<char *>(dil_buffer.get_data_handle()) +
         dil_buffer.get_item_size() * tensor.storage_offset());
@@ -56,10 +53,6 @@ dil::tensor dil_tensor_from_dil_buffer(const at::Tensor& tensor) {
     if (dil_buffer.has_workspace()) {
       result.copy_workspace(dil_buffer);
     }
-
-    if (dil_buffer.has_scale()) {
-      result.set_scale(dil_buffer.get_scale());
-    }
     // TODO(xpz): copy scales and zero_points of qtensor (what if slicing?)
 
     return result;
@@ -160,12 +153,6 @@ void reorder_to_dtype(const at::Tensor& tensor, at::ScalarType dst_scalar_type,
     return;
   }
   auto dst_desc = src.get_desc().to_type(get_dil_data_type(dst_scalar_type));
- // src may bf16 or fp32 tensor with block format,
- // there has issue for conv weight prepack if given a block format weight
-  if (!src.is_public_format()) {
-    dst_desc = dst_desc.to_default_format();
-  }
-
   reorder_to_desc(tensor, dst_desc, scales);
 }
 

torch_ipex/csrc/cpu/dil/dil/operators/batchnorm.hpp

@@ -55,8 +55,8 @@ struct batch_normalization_forward_inference
       pd_flags |= batch_normalization_flag::use_global_stats;
 
     // workaround: use src.get_desc() once issue intel/mkl-dnn#588 is resolved
-    //auto src_desc = src._get_unblocked_desc_if_4c_blocked();
-     auto src_desc = src.get_desc();
+    auto src_desc = src._get_unblocked_desc_if_4c_blocked();
+    //auto src_desc = src.get_desc();
 
     bool fuse_norm_relu = (bool) (flags & batch_normalization_flag::fuse_norm_relu);
     attr_t attr = fuse_norm_relu ? attr_t::fuse_relu() : attr_t();
@@ -132,8 +132,8 @@ struct batch_normalization_forward_inference
       }
       super(pd).execute(stream::default_stream(),
                         {{DNNL_ARG_SRC, expected_src},
-                        {DNNL_ARG_SCALE_SHIFT, scale_shift},
-                        {DNNL_ARG_DST, dst}});
+                         {DNNL_ARG_SCALE_SHIFT, scale_shift},
+                         {DNNL_ARG_DST, dst}});
     }
   }
 };