experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #33224 from Intel-tensorflow:nhasabni/mkldnnv0.21

Browse Source 
PiperOrigin-RevId: 274176852
This commit is contained in:
TensorFlower Gardener 2019-10-11 10:31:43 -07:00
commit a4893783de
2 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tensorflow/workspace.bzl
View File

@ -95,31 +95,31 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
mkl_repository(
name = "mkl_linux",
build_file = clean_dep("//third_party/mkl:mkl.BUILD"),
sha256 = "f4129843d5c2996419f96f10928edd02b2150998861a088dc7cfa1b6a058102a",
strip_prefix = "mklml_lnx_2019.0.3.20190220",
sha256 = "a936d6b277a33d2a027a024ea8e65df62bd2e162c7ca52c48486ed9d5dc27160",
strip_prefix = "mklml_lnx_2019.0.5.20190502",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/releases/download/v0.18/mklml_lnx_2019.0.3.20190220.tgz",
"https://github.com/intel/mkl-dnn/releases/download/v0.18/mklml_lnx_2019.0.3.20190220.tgz",
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/releases/download/v0.21/mklml_lnx_2019.0.5.20190502.tgz",
"https://github.com/intel/mkl-dnn/releases/download/v0.21/mklml_lnx_2019.0.5.20190502.tgz",
],
)
mkl_repository(
name = "mkl_windows",
build_file = clean_dep("//third_party/mkl:mkl.BUILD"),
sha256 = "eae0c49a7ed738f0ed97b897e952eaa881feddfa665017a8d5d9d79fd38964b4",
strip_prefix = "mklml_win_2019.0.3.20190220",
sha256 = "33cc27652df3b71d7cb84b26718b5a2e8965e2c864a502347db02746d0430d57",
strip_prefix = "mklml_win_2020.0.20190813",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/releases/download/v0.18/mklml_win_2019.0.3.20190220.zip",
"https://github.com/intel/mkl-dnn/releases/download/v0.18/mklml_win_2019.0.3.20190220.zip",
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/releases/download/v0.21/mklml_win_2020.0.20190813.zip",
"https://github.com/intel/mkl-dnn/releases/download/v0.21/mklml_win_2020.0.20190813.zip",
],
)
mkl_repository(
name = "mkl_darwin",
build_file = clean_dep("//third_party/mkl:mkl.BUILD"),
sha256 = "53fdcd7e31c309bb6af869d82987d9c6414c1b957d63d10a9caa9ad077643d99",
strip_prefix = "mklml_mac_2019.0.3.20190220",
sha256 = "2fbb71a0365d42a39ea7906568d69b1db3bfc9914fee75eedb06c5f32bf5fa68",
strip_prefix = "mklml_mac_2019.0.5.20190502",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/releases/download/v0.18/mklml_mac_2019.0.3.20190220.tgz",
"https://github.com/intel/mkl-dnn/releases/download/v0.18/mklml_mac_2019.0.3.20190220.tgz",
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/releases/download/v0.21/mklml_mac_2019.0.5.20190502.tgz",
"https://github.com/intel/mkl-dnn/releases/download/v0.21/mklml_mac_2019.0.5.20190502.tgz",
],
)
@ -135,11 +135,11 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
tf_http_archive(
name = "mkl_dnn",
build_file = clean_dep("//third_party/mkl_dnn:mkldnn.BUILD"),
sha256 = "38a1c02104ee9f630c1ad68164119cd58ad0aaf59e04ccbe7bd5781add7bfbea",
strip_prefix = "mkl-dnn-0.18",
sha256 = "ed56652dd237deb86ee9bf102c18de5f2625c059e5ab1d7512c8dc01e316b694",
strip_prefix = "mkl-dnn-0.21.2",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/archive/v0.18.tar.gz",
"https://github.com/intel/mkl-dnn/archive/v0.18.tar.gz",
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/intel/mkl-dnn/archive/v0.21.2.tar.gz",
"https://github.com/intel/mkl-dnn/archive/v0.21.2.tar.gz",
],
)

28
third_party/mkl_dnn/mkldnn.BUILD vendored
View File

@ -36,7 +36,7 @@ template_rule(
# be set to NA.
# TODO(agramesh1) Automatically get the version numbers from CMakeLists.txt.
# TODO(bhavanis): MKL-DNN minor version needs to be updated for MKL-DNN v1.x.
# The current version numbers will work only if MKL-DNN v0.18 is used.
# The current version numbers will work only if MKL-DNN v0.21 is used.
template_rule(
name = "mkldnn_version_h",
@ -44,8 +44,8 @@ template_rule(
out = "include/mkldnn_version.h",
substitutions = {
"@MKLDNN_VERSION_MAJOR@": "0",
"@MKLDNN_VERSION_MINOR@": "18",
"@MKLDNN_VERSION_PATCH@": "0",
"@MKLDNN_VERSION_MINOR@": "21",
"@MKLDNN_VERSION_PATCH@": "2",
"@MKLDNN_VERSION_HASH@": "N/A",
},
)
@ -57,19 +57,11 @@ cc_library(
"src/common/*.hpp",
"src/cpu/*.cpp",
"src/cpu/*.hpp",
"src/cpu/gemm/*.cpp",
"src/cpu/gemm/*.hpp",
"src/cpu/gemm/f32/*.cpp",
"src/cpu/gemm/f32/*.hpp",
"src/cpu/gemm/s8x8s32/*.cpp",
"src/cpu/gemm/s8x8s32/*.hpp",
"src/cpu/rnn/*.cpp",
"src/cpu/rnn/*.hpp",
"src/cpu/**/*.cpp",
"src/cpu/**/*.hpp",
"src/cpu/xbyak/*.h",
]) + if_mkl_v1_open_source_only([
":mkldnn_config_h",
"src/cpu/jit_utils/jit_utils.cpp",
"src/cpu/jit_utils/jit_utils.hpp",
]) + [":mkldnn_version_h"],
hdrs = glob(["include/*"]),
copts = [
@ -124,14 +116,8 @@ cc_library(
"src/common/*.hpp",
"src/cpu/*.cpp",
"src/cpu/*.hpp",
"src/cpu/gemm/*.cpp",
"src/cpu/gemm/*.hpp",
"src/cpu/gemm/f32/*.cpp",
"src/cpu/gemm/f32/*.hpp",
"src/cpu/gemm/s8x8s32/*.cpp",
"src/cpu/gemm/s8x8s32/*.hpp",
"src/cpu/rnn/*.cpp",
"src/cpu/rnn/*.hpp",
"src/cpu/**/*.cpp",
"src/cpu/**/*.hpp",
"src/cpu/xbyak/*.h",
]) + [":mkldnn_version_h"],
hdrs = glob(["include/*"]),