Merge pull request #50757 from alenik01:libs_versions_update

PiperOrigin-RevId: 384626265
Change-Id: Ia7b6d2d6e2eb8ba0d195ad9fab55065f26d54349
This commit is contained in:
TensorFlower Gardener
2021-07-13 22:50:33 -07:00
5 changed files with 21 additions and 16 deletions

View File

@@ -378,7 +378,7 @@ def tf_copts(
# optimizations for Intel builds using oneDNN if configured
if_enable_mkl(["-DENABLE_MKL"]) +
if_mkldnn_openmp(["-DENABLE_ONEDNN_OPENMP"]) +
if_mkldnn_aarch64_acl(["-DENABLE_MKL", "-DENABLE_ONEDNN_OPENMP"]) +
if_mkldnn_aarch64_acl(["-DENABLE_MKL", "-DENABLE_ONEDNN_OPENMP", "-DDNNL_AARCH64_USE_ACL=1"]) +
if_android_arm(["-mfpu=neon"]) +
if_linux_x86_64(["-msse3"]) +
if_ios_x86_64(["-msse4.1"]) +

View File

@@ -195,23 +195,23 @@ def _tf_repositories():
tf_http_archive(
name = "mkl_dnn_acl_compatible",
build_file = "//third_party/mkl_dnn:mkldnn_acl.BUILD",
sha256 = "4d655c0751ee6439584ef5e3d465953fe0c2f4ee2700bc02699bdc1d1572af0d",
strip_prefix = "oneDNN-2.2",
sha256 = "ccb2dbd9da36cd873cf573b4201d61bdba7438f12b144e6c7d061eb12a641751",
strip_prefix = "oneDNN-2.3",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz",
"https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz",
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/oneapi-src/oneDNN/archive/v2.3.tar.gz",
"https://github.com/oneapi-src/oneDNN/archive/v2.3.tar.gz",
],
)
tf_http_archive(
name = "compute_library",
sha256 = "cdb3d8a7ab7ea13f0df207a20657f2827ac631c24aa0e8487bacf97697237bdf",
strip_prefix = "ComputeLibrary-21.02",
sha256 = "18011eb6dc999f030df609ff2b528e0067ab9f76921fa0b53e35859e06a0aa10",
strip_prefix = "ComputeLibrary-21.05",
build_file = "//third_party/compute_library:BUILD",
patch_file = "//third_party/compute_library:compute_library.patch",
urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/ARM-software/ComputeLibrary/archive/v21.02.tar.gz",
"https://github.com/ARM-software/ComputeLibrary/archive/v21.02.tar.gz",
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/ARM-software/ComputeLibrary/archive/v21.05.tar.gz",
"https://github.com/ARM-software/ComputeLibrary/archive/v21.05.tar.gz",
],
)

View File

@@ -42,6 +42,7 @@ cc_library(
"ENABLE_NHWC_KERNELS",
],
includes = [
"arm_compute/runtime",
"src/core/NEON/kernels/assembly",
"src/core/NEON/kernels/convolution/common",
"src/core/NEON/kernels/convolution/winograd",
@@ -58,7 +59,10 @@ cc_library(
"src/runtime/cpu/**/*.cpp",
"**/*.h",
]),
hdrs = glob(["arm_compute/runtime/**/*.h"]) + [
hdrs = glob([
"arm_compute/runtime/**/*.h",
"arm_compute/runtime/*.h",
]) + [
"arm_compute_version.embed",
],
defines = ["ARM_COMPUTE_CPP_SCHEDULER"],

View File

@@ -4,5 +4,5 @@ index 000000000..c986ad52a
--- /dev/null
+++ b/arm_compute_version.embed
@@ -0,0 +1,1 @@
+"arm_compute_version=v21.02 Build options: {} Git hash=b'N/A'"
+"arm_compute_version=v21.05 Build options: {} Git hash=b'N/A'"
\ No newline at end of file

View File

@@ -9,9 +9,10 @@ _DNNL_RUNTIME_OMP = {
"#cmakedefine DNNL_CPU_THREADING_RUNTIME DNNL_RUNTIME_${DNNL_CPU_THREADING_RUNTIME}": "#define DNNL_CPU_THREADING_RUNTIME DNNL_RUNTIME_OMP",
"#cmakedefine DNNL_CPU_RUNTIME DNNL_RUNTIME_${DNNL_CPU_RUNTIME}": "#define DNNL_CPU_RUNTIME DNNL_RUNTIME_OMP",
"#cmakedefine DNNL_GPU_RUNTIME DNNL_RUNTIME_${DNNL_GPU_RUNTIME}": "#define DNNL_GPU_RUNTIME DNNL_RUNTIME_NONE",
"#cmakedefine DNNL_WITH_SYCL": "/* #undef DNNL_WITH_SYCL */",
"#cmakedefine DNNL_WITH_LEVEL_ZERO": "/* #undef DNNL_WITH_LEVEL_ZERO */",
"#cmakedefine DNNL_SYCL_CUDA": "/* #undef DNNL_SYCL_CUDA */",
"#cmakedefine DNNL_USE_RT_OBJECTS_IN_PRIMITIVE_CACHE": "#undef DNNL_USE_RT_OBJECTS_IN_PRIMITIVE_CACHE",
"#cmakedefine DNNL_WITH_SYCL": "#undef DNNL_WITH_SYCL",
"#cmakedefine DNNL_WITH_LEVEL_ZERO": "#undef DNNL_WITH_LEVEL_ZERO",
"#cmakedefine DNNL_SYCL_CUDA": "#undef DNNL_SYCL_CUDA",
}
template_rule(
@@ -27,9 +28,9 @@ template_rule(
out = "include/oneapi/dnnl/dnnl_version.h",
substitutions = {
"@DNNL_VERSION_MAJOR@": "2",
"@DNNL_VERSION_MINOR@": "2",
"@DNNL_VERSION_MINOR@": "3",
"@DNNL_VERSION_PATCH@": "0",
"@DNNL_VERSION_HASH@": "269680b228218158fc172e9d5277446f73ac1917",
"@DNNL_VERSION_HASH@": "N/A",
},
)