fix dnnl runtime

Author: rebel-jangys

python/tvm/relay/frontend/keras.py

@@ -456,6 +456,8 @@ def _convert_convolution3d(inexpr, keras_layer, etab, data_layout, input_shape=N
     if input_shape is None:
         input_shape = keras_layer.input_shape
 
+    print (data_layout)
+    
     if data_layout == "NDHWC":
         kernel_layout = "DHWIO"
         if is_deconv:

src/runtime/contrib/dnnl/dnnl_json_runtime.cc

@@ -424,15 +424,10 @@ class DNNLJSONRuntime : public JSONRuntimeBase {
     // Minus one for DNNL representation. No dilation for DNNL is 0, for relay is 1.
     for (auto& d : dilates) d--;
 
-    // TODO(@apeskov): WA. conv3dTranspose uses wrong layout specifier. IO instead of OI.
-    auto wgh_logic_layout = TensorRequisite::DefaultLogicLayoutFor(wgh_layout);
-    if (wgh_logic_layout == "OIDHW") wgh_logic_layout = "IODHW";
-    if (wgh_logic_layout == "GOIDHW") wgh_logic_layout = "GIODHW";
-
     // Take into account provided layout strings
     src_tr = src_tr.TreatAs(src_layout);
     dst_tr = dst_tr.TreatAs(dst_layout);
-    wgh_tr = wgh_tr.TreatAs(wgh_layout, wgh_logic_layout);
+    wgh_tr = wgh_tr.TreatAs(wgh_layout);
 
     // Should support G mixed with O. Like { G*O, I, H, W }
     if (wgh_layout.find("G") == std::string::npos) {