From ec1d1795f24591e479014a92a5928aefc522fde4 Mon Sep 17 00:00:00 2001
From: Alexander Zai <alexzai@amazon.com>
Date: Mon, 6 Aug 2018 20:10:44 -0700
Subject: [PATCH] only reorder if mkldnn

---
 src/operator/nn/mkldnn/mkldnn_base-inl.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/operator/nn/mkldnn/mkldnn_base-inl.h b/src/operator/nn/mkldnn/mkldnn_base-inl.h
index 6014cc0cba4f..57983dcc49af 100644
--- a/src/operator/nn/mkldnn/mkldnn_base-inl.h
+++ b/src/operator/nn/mkldnn/mkldnn_base-inl.h
@@ -353,8 +353,12 @@ static inline void InvalidateOutputs(const std::vector<NDArray> &arrs,
 
 static inline std::vector<NDArray> CreateDefaultInputs(const std::vector<NDArray> &arrs) {
   std::vector<NDArray> buffer(arrs.size());
-  for (size_t i = 0; i < arrs.size(); ++i)
-    buffer[i] = arrs[i].Reorder2Default();
+  for (size_t i = 0; i < arrs.size(); ++i) {
+    if (arrs[i].IsMKLDNNData()) {
+      buffer[i] = arrs[i].Reorder2Default();
+    }
+    buffer[i] = arrs[i];
+  }
   return buffer;
 }