diff options
| -rw-r--r-- | tensorflow/core/util/mkl_util.h | 18 | ||||
| -rw-r--r-- | tensorflow/workspace.bzl | 20 | ||||
| -rw-r--r-- | third_party/mkl_dnn/mkldnn.BUILD | 2 |
3 files changed, 22 insertions, 18 deletions
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h index 566a42dbd5..07345df04d 100644 --- a/tensorflow/core/util/mkl_util.h +++ b/tensorflow/core/util/mkl_util.h @@ -1882,9 +1882,9 @@ class MklPrimitive { public: virtual ~MklPrimitive() {} - // Dummy data. Its size, hard-coded as 256 here, does - // not matter since MKL should never operate on this buffer. - unsigned char DummyData[256]; + // Dummy data. + // does not matter since MKL should never operate on this buffer. + unsigned char *DummyData = nullptr; }; const mkldnn::memory::dims NONE_DIMS = {}; @@ -1896,8 +1896,9 @@ class MklPrimitiveFactory { ~MklPrimitiveFactory() {} MklPrimitive* GetOp(const string& key) { - auto stream_iter = MklPrimitiveFactory<T>::GetHashMap().find(key); - if (stream_iter == MklPrimitiveFactory<T>::GetHashMap().end()) { + auto &map = MklPrimitiveFactory<T>::GetHashMap(); + auto stream_iter = map.find(key); + if (stream_iter == map.end()) { return nullptr; } else { CHECK(stream_iter->second != nullptr) << "nullptr present in map"; @@ -1906,11 +1907,12 @@ class MklPrimitiveFactory { } void SetOp(const string& key, MklPrimitive* op) { - auto stream_iter = MklPrimitiveFactory<T>::GetHashMap().find(key); + auto &map = MklPrimitiveFactory<T>::GetHashMap(); + auto stream_iter = map.find(key); - CHECK(stream_iter == MklPrimitiveFactory<T>::GetHashMap().end()); + CHECK(stream_iter == map.end()); - MklPrimitiveFactory<T>::GetHashMap()[key] = op; + map[key] = op; } private: diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 45b1abeb10..cfaf034a7a 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -52,8 +52,8 @@ def tf_workspace(path_prefix="", tf_repo_name=""): mkl_repository( name = "mkl_linux", urls = [ - "https://mirror.bazel.build/github.com/intel/mkl-dnn/releases/download/v0.14/mklml_lnx_2018.0.3.20180406.tgz", - "https://github.com/intel/mkl-dnn/releases/download/v0.14/mklml_lnx_2018.0.3.20180406.tgz" + "https://mirror.bazel.build/github.com/intel/mkl-dnn/releases/download/v0.15/mklml_lnx_2018.0.3.20180406.tgz", + "https://github.com/intel/mkl-dnn/releases/download/v0.15/mklml_lnx_2018.0.3.20180406.tgz" ], sha256 = "d2305244fdc9b87db7426ed4496e87a4b3977ad3374d73b8000e8b7a5b7aa725", strip_prefix = "mklml_lnx_2018.0.3.20180406", @@ -62,8 +62,8 @@ def tf_workspace(path_prefix="", tf_repo_name=""): mkl_repository( name = "mkl_windows", urls = [ - "https://mirror.bazel.build/github.com/intel/mkl-dnn/releases/download/v0.14/mklml_win_2018.0.3.20180406.zip", - "https://github.com/intel/mkl-dnn/releases/download/v0.14/mklml_win_2018.0.3.20180406.zip" + "https://mirror.bazel.build/github.com/intel/mkl-dnn/releases/download/v0.15/mklml_win_2018.0.3.20180406.zip", + "https://github.com/intel/mkl-dnn/releases/download/v0.15/mklml_win_2018.0.3.20180406.zip" ], sha256 = "a584a5bf1c8d2ad70b90d12b52652030e9a338217719064fdb84b7ad0d693694", strip_prefix = "mklml_win_2018.0.3.20180406", @@ -72,8 +72,8 @@ def tf_workspace(path_prefix="", tf_repo_name=""): mkl_repository( name = "mkl_darwin", urls = [ - "https://mirror.bazel.build/github.com/intel/mkl-dnn/releases/download/v0.14/mklml_mac_2018.0.3.20180406.tgz", - "https://github.com/intel/mkl-dnn/releases/download/v0.14/mklml_mac_2018.0.3.20180406.tgz" + "https://mirror.bazel.build/github.com/intel/mkl-dnn/releases/download/v0.15/mklml_mac_2018.0.3.20180406.tgz", + "https://github.com/intel/mkl-dnn/releases/download/v0.15/mklml_mac_2018.0.3.20180406.tgz" ], sha256 = "094e3dfd61c816136dc8d12a45cc611ce26c5f4828176a3644cd0b0efa15a25b", strip_prefix = "mklml_mac_2018.0.3.20180406", @@ -87,11 +87,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""): tf_http_archive( name = "mkl_dnn", urls = [ - "https://mirror.bazel.build/github.com/intel/mkl-dnn/archive/v0.14.tar.gz", - "https://github.com/intel/mkl-dnn/archive/v0.14.tar.gz", + "https://mirror.bazel.build/github.com/intel/mkl-dnn/archive/0c1cf54b63732e5a723c5670f66f6dfb19b64d20.zip", + "https://github.com/intel/mkl-dnn/archive/0c1cf54b63732e5a723c5670f66f6dfb19b64d20.zip" ], - sha256 = "efebc53882856afec86457a2da644693f5d59c68772d41d640d6b60a8efc4eb0", - strip_prefix = "mkl-dnn-0.14", + sha256 = "bfea2893ec978577a0e6c7a8703746bd87f60a4ea7c9ee96e3bafdf7c55a9f12", + strip_prefix = "mkl-dnn-0c1cf54b63732e5a723c5670f66f6dfb19b64d20", build_file = clean_dep("//third_party/mkl_dnn:mkldnn.BUILD"), ) diff --git a/third_party/mkl_dnn/mkldnn.BUILD b/third_party/mkl_dnn/mkldnn.BUILD index 57d2e1292b..cd1f9a6327 100644 --- a/third_party/mkl_dnn/mkldnn.BUILD +++ b/third_party/mkl_dnn/mkldnn.BUILD @@ -18,6 +18,7 @@ cc_library( srcs = glob([ "src/common/*.cpp", "src/cpu/*.cpp", + "src/cpu/gemm/*.cpp" ]), hdrs = glob(["include/*"]), copts = [ @@ -42,6 +43,7 @@ cc_library( "src/common", "src/cpu", "src/cpu/xbyak", + "src/cpu/gemm" ], nocopts = "-fno-exceptions", visibility = ["//visibility:public"], |