Remove warning msg and fix onednn cpu commit (#2447)

intel · Oct 20, 2023 · 0659c19 · 0659c19
1 parent d3f447a
commit 0659c19
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 37 deletions.
diff --git a/itex/core/ops/nn_ops.cc b/itex/core/ops/nn_ops.cc
@@ -4075,33 +4075,6 @@ void Register_ITEXForwardAUGRUOp() {
   }
 }
 
-void Register_QuantizedMaxPool3DOp() {
-  itex::StatusUniquePtr status(TF_NewStatus());
-  {
-    TF_OpDefinitionBuilder* op_builder =
-        TF_NewOpDefinitionBuilder("_QuantizedMaxPool3D");
-    TF_OpDefinitionBuilderAddInput(op_builder, "input: T");
-    TF_OpDefinitionBuilderAddInput(op_builder, "min_input: float");
-    TF_OpDefinitionBuilderAddInput(op_builder, "max_input: float");
-    TF_OpDefinitionBuilderAddOutput(op_builder, "output: T");
-    TF_OpDefinitionBuilderAddOutput(op_builder, "min_output: float");
-    TF_OpDefinitionBuilderAddOutput(op_builder, "max_output: float");
-    TF_OpDefinitionBuilderAddAttr(op_builder, "T: quantizedtype");
-    TF_OpDefinitionBuilderAddAttr(op_builder, "ksize: list(int) >= 5");
-    TF_OpDefinitionBuilderAddAttr(op_builder, "strides: list(int) >= 5");
-    TF_OpDefinitionBuilderAddAttr(op_builder,
-                                  GetPaddingAttrStringWithExplicit());
-    TF_OpDefinitionBuilderAddAttr(op_builder, GetExplicitPaddingsAttrString());
-
-    // TODO(itex): Implement maxpool_shape_fn in the future
-    TF_OpDefinitionBuilderSetShapeInferenceFunction(op_builder,
-                                                    &unknown_shape_fn);
-    TF_RegisterOpDefinition(op_builder, status.get());
-    ITEX_CHECK_EQ(TF_OK, TF_GetCode(status.get()))
-        << "_QuantizedMaxPool3D op registration failed: ";
-  }
-}
-
 void Register_ITEXQuantizedMaxPool3DOp() {
   itex::StatusUniquePtr status(TF_NewStatus());
   {

diff --git a/itex/core/ops/op_init.cc b/itex/core/ops/op_init.cc
@@ -45,7 +45,6 @@ void Register_TFLegacyOp() {
       {"_QuantizedFusedMatMulAndDequantize",
        Register_QuantizedFusedMatMulAndDequantizeOp},
       {"_QuantizedMatMul", Register_QuantizedMatMulOp},
-      {"_QuantizedMaxPool3D", Register_QuantizedMaxPool3DOp},
       {"_QuantizedTranspose", Register_QuantizedTransposeOp}};
 
   for (auto register_pair : op_register_map) {

diff --git a/itex/core/ops/op_init.h b/itex/core/ops/op_init.h
@@ -40,7 +40,6 @@ void Register_QuantizedFusedBatchMatMulV2AndDequantizeOp();
 void Register_QuantizedFusedMatMulOp();
 void Register_QuantizedFusedMatMulAndRequantizeOp();
 void Register_QuantizedFusedMatMulAndDequantizeOp();
-void Register_QuantizedMaxPool3DOp();
 void Register_QuantizedTransposeOp();
 
 // TODO(itex): remove this op definition, once this op is upstreamed from

diff --git a/itex/core/utils/onednn/onednn_util.h b/itex/core/utils/onednn/onednn_util.h
@@ -236,10 +236,10 @@ inline dnnl::stream CreateDnnlStream(const OpKernelContext& ctx,
                                      const dnnl::engine& engine,
                                      int num_thread = -1) {
 #ifndef INTEL_CPU_ONLY
-  if (engine.get_kind() == dnnl::engine::kind::gpu) {
-    auto* ITEX_GPU_stream = ctx.GetDeviceStream();
-    return dnnl::sycl_interop::make_stream(engine, *ITEX_GPU_stream);
-  }
+  ITEX_CHECK(engine.get_kind() == dnnl::engine::kind::gpu)
+      << "Create oneDNN stream for unsupported engine.";
+  auto* ITEX_GPU_stream = ctx.GetDeviceStream();
+  return dnnl::sycl_interop::make_stream(engine, *ITEX_GPU_stream);
 #else
   std::call_once(read_env_once_flag, []() {
     ITEX_CHECK_OK(

diff --git a/itex/core/wrapper/itex_cpu_wrapper.h b/itex/core/wrapper/itex_cpu_wrapper.h
@@ -17,4 +17,4 @@ limitations under the License.
 #include "itex/core/utils/env_var.h"
 
 static void* onednn_handle;
-#endif // ITEX_CORE_WRAPPER_ITEX_CPU_WRAPPER_H_
+#endif  // ITEX_CORE_WRAPPER_ITEX_CPU_WRAPPER_H_
diff --git a/itex/workspace.bzl b/itex/workspace.bzl
@@ -63,8 +63,8 @@ def itex_workspace(path_prefix = "", tf_repo_name = ""):
         system_build_file = clean_dep("//third_party/systemlibs:pybind11.BUILD"),
     )
 
-    # 2023008017 master
-    _ONEDNN_CPU_COMMIT = "de0a50ffc4b6601457bfe6efb5ac8b133dcc98f0"
+    # 202301014 master, rls-v3.4-pc
+    _ONEDNN_CPU_COMMIT = "5b4f24c"
 
     new_git_repository(
         name = "onednn_cpu",
@@ -79,7 +79,7 @@ def itex_workspace(path_prefix = "", tf_repo_name = ""):
 
     new_git_repository(
         name = "onednn_cpu_eigen",
-        commit = "5b4f24c",
+        commit = _ONEDNN_CPU_COMMIT,
         remote = "https://github.com/oneapi-src/oneDNN.git",
         build_file = clean_dep("//third_party/onednn:onednn_cpu_eigen.BUILD"),
         verbose = True,