Merge pull request #11 from jinhuang415/refactor_pr1

OP primitive cache: use memory as signature for MKLDNN storage type
zheng-da · Jan 10, 2018 · 1cba97f · 1cba97f
2 parents e814b3e + b4cdd13
commit 1cba97f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/operator/nn/mkldnn/mkldnn_act.cc b/src/operator/nn/mkldnn/mkldnn_act.cc
@@ -141,7 +141,7 @@ static MKLDNNActForward &GetActForward(const ActivationParam& param,
   MKLDNNActSignature key(param);
   key.AddSign(ctx.is_train);
   key.AddSign(param.act_type);
-  key.AddSign(in_mem);
+  key.AddSign(in_data);
 
   auto it = fwds.find(key);
   if (it == fwds.end()) {

diff --git a/src/operator/nn/mkldnn/mkldnn_base-inl.h b/src/operator/nn/mkldnn/mkldnn_base-inl.h
@@ -313,9 +313,13 @@ class MKLDNNOpSignature {
   }
 
   void AddSign(const NDArray &arr) {
-    hash = hash * 2 + arr.dtype();
-    eles.push_back(arr.dtype());
-    AddSign(arr.shape());
+    if (arr.IsMKLDNN()) {
+      AddSign(*(arr.GetMKLDNNData()));
+    } else {
+      hash = hash * 2 + arr.dtype();
+      eles.push_back(arr.dtype());
+      AddSign(arr.shape());
+    }
   }
 
   void AddSign(const TShape &shape) {