From d234e832a7c85bdd2d1a7baf649d0f74855d7579 Mon Sep 17 00:00:00 2001 From: "ag.ramesh" Date: Fri, 25 Sep 2020 21:23:10 -0700 Subject: [PATCH 1/6] Removed MKL binary blob and replaced openmp with opensource lib. --- tensorflow/tensorflow.bzl | 3 +- tensorflow/workspace.bzl | 22 ++--- third_party/llvm-openmp/BUILD | 124 ++++++++++++++++++++++++++ third_party/llvm/BUILD | 2 +- third_party/llvm/expand_cmake_vars.py | 3 +- third_party/llvm/llvm.bzl | 14 +-- third_party/mkl/BUILD | 13 ++- third_party/mkl/mkl.BUILD | 9 -- 8 files changed, 157 insertions(+), 33 deletions(-) create mode 100644 third_party/llvm-openmp/BUILD diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 8ed12136c55..a364143c935 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -331,8 +331,7 @@ def tf_copts( if_tpu(["-DLIBTFTPU"]) + if_xla_available(["-DTENSORFLOW_USE_XLA=1"]) + if_tensorrt(["-DGOOGLE_TENSORRT=1"]) + - if_mkl(["-DINTEL_MKL=1", "-DENABLE_MKLDNN_V1", "-DENABLE_INTEL_MKL_BFLOAT16"]) + - if_mkl_open_source_only(["-DINTEL_MKL_DNN_ONLY"]) + + if_mkl(["-DINTEL_MKL=1", "-DENABLE_MKLDNN_V1", "-DENABLE_INTEL_MKL_BFLOAT16","-DINTEL_MKL_DNN_ONLY"]) + if_mkldnn_threadpool(["-DENABLE_MKLDNN_THREADPOOL"]) + if_enable_mkl(["-DENABLE_MKL"]) + if_ngraph(["-DINTEL_NGRAPH=1"]) + diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index eafc52ad549..78dd4b4576d 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -125,16 +125,6 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""): armhf_repo = "../armhf_linux_toolchain", ) - mkl_repository( - name = "mkl_linux", - build_file = clean_dep("//third_party/mkl:mkl.BUILD"), - 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.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"), @@ -730,6 +720,18 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""): }, ) + # Intel openMP that is part of LLVM sources. + tf_http_archive( + name = "llvm-openmp", + build_file = clean_dep("//third_party/llvm-openmp:BUILD"), + sha256 = "d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44", + strip_prefix = "openmp-10.0.1.src", + urls = [ + "https://storage.googleapis.com/mirror.tensorflow.org/github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz", + "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz", + ], + ) + tf_http_archive( name = "lmdb", build_file = clean_dep("//third_party:lmdb.BUILD"), diff --git a/third_party/llvm-openmp/BUILD b/third_party/llvm-openmp/BUILD new file mode 100644 index 00000000000..ee355768777 --- /dev/null +++ b/third_party/llvm-openmp/BUILD @@ -0,0 +1,124 @@ +# Build file for OpenMP library that is part of llvm + +exports_files(["LICENSE.txt"]) + +load( + "@org_tensorflow//third_party/llvm:llvm.bzl", + "cmake_var_string", + "dict_add", + "expand_cmake_vars", +) +load( + "@org_tensorflow//third_party:common.bzl", + "template_rule", +) + +genrule( + name = "il8n_id", + srcs = [ + "runtime/tools/message-converter.pl", + "runtime/src/i18n/en_US.txt", + ], + outs = ["include/kmp_i18n_id.inc"], + cmd = "$(location runtime/tools/message-converter.pl) --os=lin --prefix=kmp_i18n --enum=$@ $(location runtime/src/i18n/en_US.txt)", +) + +genrule( + name = "kmp_i18n_default", + srcs = [ + "runtime/tools/message-converter.pl", + "runtime/src/i18n/en_US.txt", + ], + outs = ["include/kmp_i18n_default.inc"], + cmd = "perl $(location runtime/tools/message-converter.pl) --os=lin --prefix=kmp_i18n --default=$@ $(location runtime/src/i18n/en_US.txt)", +) + +# Bazel doesn't accept .txt as an input, rename the ldscript to .inc to workaround. +genrule( + name = "ldscript", + srcs = ["runtime/src/exports_so.txt"], + outs = ["exports_so.inc"], + cmd = "cp $(location runtime/src/exports_so.txt) $@", +) + +# Cmake vars to replace. +omp_vars = { + "LIBOMP_USE_VERSION_SYMBOLS": 1, + "LIBOMP_HAVE_WEAK_ATTRIBUTE": 1, + "LIBOMP_USE_ADAPTIVE_LOCKS": 1, + "LIBOMP_ENABLE_ASSERTIONS": 1, + "LIBOMP_ENABLE_SHARED": 1, + "LIBOMP_LEGAL_ARCH": "Intel(R) 64", + "LIBOMP_LIB_FILE": "libiomp5.so", + "LIBOMP_VERSION_MAJOR": 5, + "LIBOMP_VERSION_MINOR": 0, +} + +omp_all_cmake_vars = cmake_var_string(dict_add(omp_vars)) + +expand_cmake_vars( + name = "config_kmp", + src = "runtime/src/kmp_config.h.cmake", + cmake_vars = omp_all_cmake_vars, + dst = "include/kmp_config.h", +) + +expand_cmake_vars( + name = "config_omp", + src = "runtime/src/include/omp.h.var", + cmake_vars = omp_all_cmake_vars, + dst = "include/omp.h", +) + +cc_binary( + name = "libiomp5.so", + srcs = glob([ + "runtime/src/*.h", + "runtime/src/kmp_alloc.cpp", + "runtime/src/kmp_atomic.cpp", + "runtime/src/kmp_csupport.cpp", + "runtime/src/kmp_debug.cpp", + "runtime/src/kmp_itt.cpp", + "runtime/src/kmp_environment.cpp", + "runtime/src/kmp_error.cpp", + "runtime/src/kmp_global.cpp", + "runtime/src/kmp_i18n.cpp", + "runtime/src/kmp_io.cpp", + "runtime/src/kmp_runtime.cpp", + "runtime/src/kmp_settings.cpp", + "runtime/src/kmp_str.cpp", + "runtime/src/kmp_tasking.cpp", + "runtime/src/kmp_threadprivate.cpp", + "runtime/src/kmp_utility.cpp", + "runtime/src/kmp_barrier.cpp", + "runtime/src/kmp_wait_release.cpp", + "runtime/src/kmp_affinity.cpp", + "runtime/src/kmp_dispatch.cpp", + "runtime/src/kmp_lock.cpp", + "runtime/src/kmp_sched.cpp", + "runtime/src/kmp_taskdeps.cpp", + "runtime/src/kmp_cancel.cpp", + "runtime/src/kmp_ftn_cdecl.cpp", + "runtime/src/kmp_ftn_extra.cpp", + "runtime/src/kmp_version.cpp", + + #linux specific files + "runtime/src/z_Linux_util.cpp", + "runtime/src/kmp_gsupport.cpp", + "runtime/src/z_Linux_asm.S", + ]) + [ + ":config_kmp", + ":config_omp", + ":il8n_id", + ":kmp_i18n_default", + ":ldscript", + ], + copts = ["-Domp_EXPORTS -D_GNU_SOURCE -D_REENTRANT"], + includes = [ + "include/", + "runtime/src/", + ], + linkopts = ["-lpthread -ldl -Wl,--version-script=$(location :ldscript)"], + linkshared = True, + visibility = ["//visibility:public"], +) diff --git a/third_party/llvm/BUILD b/third_party/llvm/BUILD index 1a5634a6285..f2e079aad76 100644 --- a/third_party/llvm/BUILD +++ b/third_party/llvm/BUILD @@ -2,5 +2,5 @@ py_binary( name = "expand_cmake_vars", srcs = ["expand_cmake_vars.py"], srcs_version = "PY2AND3", - visibility = ["@llvm-project//:__subpackages__"], + visibility = ["//visibility:public"], ) diff --git a/third_party/llvm/expand_cmake_vars.py b/third_party/llvm/expand_cmake_vars.py index ffc6a255fd1..73f071aa504 100644 --- a/third_party/llvm/expand_cmake_vars.py +++ b/third_party/llvm/expand_cmake_vars.py @@ -25,6 +25,7 @@ import sys _CMAKE_DEFINE_REGEX = re.compile(r"\s*#cmakedefine\s+([A-Za-z_0-9]*)(\s.*)?$") _CMAKE_DEFINE01_REGEX = re.compile(r"\s*#cmakedefine01\s+([A-Za-z_0-9]*)") _CMAKE_VAR_REGEX = re.compile(r"\${([A-Za-z_0-9]*)}") +_CMAKE_ATVAR_REGEX = re.compile(r"\@([A-Za-z_0-9]*)@") def _parse_args(argv): @@ -50,7 +51,7 @@ def _expand_variables(input_str, cmake_vars): if match.group(1) in cmake_vars: return cmake_vars[match.group(1)] return "" - return _CMAKE_VAR_REGEX.sub(replace, input_str) + return _CMAKE_ATVAR_REGEX.sub(replace,_CMAKE_VAR_REGEX.sub(replace, input_str)) def _expand_cmakedefines(line, cmake_vars): diff --git a/third_party/llvm/llvm.bzl b/third_party/llvm/llvm.bzl index dcbaab9edd4..c2be9dca302 100644 --- a/third_party/llvm/llvm.bzl +++ b/third_party/llvm/llvm.bzl @@ -7,7 +7,7 @@ TODO(chandlerc): Currently this expresses include-based dependencies as correctly understood by the build system. """ -def _dict_add(*dictionaries): +def dict_add(*dictionaries): """Returns a new `dict` that has all the entries of the given dictionaries. If the same key is present in more than one of the input dictionaries, the @@ -305,7 +305,7 @@ win32_cmake_vars = { # than hardcoding x86_64. llvm_all_cmake_vars = select({ "@org_tensorflow//tensorflow:macos": cmake_var_string( - _dict_add( + dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-apple-darwin"), posix_cmake_vars, @@ -313,7 +313,7 @@ llvm_all_cmake_vars = select({ ), ), "@org_tensorflow//tensorflow:linux_ppc64le": cmake_var_string( - _dict_add( + dict_add( cmake_vars, llvm_target_cmake_vars("PowerPC", "powerpc64le-unknown-linux_gnu"), posix_cmake_vars, @@ -321,21 +321,21 @@ llvm_all_cmake_vars = select({ ), ), "@org_tensorflow//tensorflow:windows": cmake_var_string( - _dict_add( + dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-pc-win32"), win32_cmake_vars, ), ), "@org_tensorflow//tensorflow:freebsd": cmake_var_string( - _dict_add( + dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-unknown-freebsd"), posix_cmake_vars, ), ), "@org_tensorflow//tensorflow:linux_s390x": cmake_var_string( - _dict_add( + dict_add( cmake_vars, llvm_target_cmake_vars("SystemZ", "systemz-unknown-linux_gnu"), posix_cmake_vars, @@ -343,7 +343,7 @@ llvm_all_cmake_vars = select({ ), ), "//conditions:default": cmake_var_string( - _dict_add( + dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-unknown-linux_gnu"), posix_cmake_vars, diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD index 66a2bf8ceb9..5cee0514a06 100644 --- a/third_party/mkl/BUILD +++ b/third_party/mkl/BUILD @@ -34,7 +34,7 @@ filegroup( name = "LICENSE", srcs = ["MKL_LICENSE"] + select({ "@org_tensorflow//tensorflow:linux_x86_64": [ - "@mkl_linux//:LICENSE", + "@llvm-openmp//:LICENSE.txt", ], "@org_tensorflow//tensorflow:macos": [ "@mkl_darwin//:LICENSE", @@ -47,13 +47,20 @@ filegroup( visibility = ["//visibility:public"], ) +cc_library( + name = "mkl_libs_linux", + srcs = [ + "@llvm-openmp//:libiomp5.so", + ], + visibility = ["//visibility:public"], +) + cc_library( name = "intel_binary_blob", visibility = ["//visibility:public"], deps = select({ "@org_tensorflow//tensorflow:linux_x86_64": [ - "@mkl_linux//:mkl_headers", - "@mkl_linux//:mkl_libs_linux", + ":mkl_libs_linux", ], "@org_tensorflow//tensorflow:macos": [ "@mkl_darwin//:mkl_headers", diff --git a/third_party/mkl/mkl.BUILD b/third_party/mkl/mkl.BUILD index 72370182c41..32d2965780f 100644 --- a/third_party/mkl/mkl.BUILD +++ b/third_party/mkl/mkl.BUILD @@ -17,15 +17,6 @@ cc_library( visibility = ["//visibility:public"], ) -cc_library( - name = "mkl_libs_linux", - srcs = [ - "lib/libiomp5.so", - "lib/libmklml_intel.so", - ], - visibility = ["//visibility:public"], -) - cc_library( name = "mkl_libs_darwin", srcs = [ From fe52a4dac4440cbce9df7c3a54badb799286791f Mon Sep 17 00:00:00 2001 From: "ag.ramesh" Date: Wed, 30 Sep 2020 19:50:57 -0700 Subject: [PATCH 2/6] Removed redundant \ --- third_party/llvm/expand_cmake_vars.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/llvm/expand_cmake_vars.py b/third_party/llvm/expand_cmake_vars.py index 73f071aa504..a3a1e524691 100644 --- a/third_party/llvm/expand_cmake_vars.py +++ b/third_party/llvm/expand_cmake_vars.py @@ -25,7 +25,7 @@ import sys _CMAKE_DEFINE_REGEX = re.compile(r"\s*#cmakedefine\s+([A-Za-z_0-9]*)(\s.*)?$") _CMAKE_DEFINE01_REGEX = re.compile(r"\s*#cmakedefine01\s+([A-Za-z_0-9]*)") _CMAKE_VAR_REGEX = re.compile(r"\${([A-Za-z_0-9]*)}") -_CMAKE_ATVAR_REGEX = re.compile(r"\@([A-Za-z_0-9]*)@") +_CMAKE_ATVAR_REGEX = re.compile(r"@([A-Za-z_0-9]*)@") def _parse_args(argv): From b905066f7e946f440d84f7b8667a47fb261563f1 Mon Sep 17 00:00:00 2001 From: "ag.ramesh" Date: Thu, 1 Oct 2020 22:07:31 -0700 Subject: [PATCH 3/6] Updated comments --- third_party/llvm/expand_cmake_vars.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/llvm/expand_cmake_vars.py b/third_party/llvm/expand_cmake_vars.py index a3a1e524691..067e4f88d5a 100644 --- a/third_party/llvm/expand_cmake_vars.py +++ b/third_party/llvm/expand_cmake_vars.py @@ -38,10 +38,10 @@ def _parse_args(argv): def _expand_variables(input_str, cmake_vars): - """Expands ${VARIABLE}s in 'input_str', using dictionary 'cmake_vars'. + """Expands ${VARIABLE} and @VARIABLE@s in 'input_str', using dictionary 'cmake_vars'. Args: - input_str: the string containing ${VARIABLE} expressions to expand. + input_str: the string containing ${VARIABLE} and @VARIABLE@ expressions to expand. cmake_vars: a dictionary mapping variable names to their values. Returns: From 0542d9f811992f887c8b3a923b0cbbc4a2ec74e8 Mon Sep 17 00:00:00 2001 From: "ag.ramesh" Date: Fri, 9 Oct 2020 09:29:44 -0700 Subject: [PATCH 4/6] Addressed review comments. --- third_party/llvm-openmp/BUILD | 16 +++++++--------- third_party/llvm/BUILD | 5 ++++- third_party/llvm/expand_cmake_vars.py | 4 ++-- third_party/llvm/llvm.bzl | 14 +++++++------- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/third_party/llvm-openmp/BUILD b/third_party/llvm-openmp/BUILD index ee355768777..759e91e60fc 100644 --- a/third_party/llvm-openmp/BUILD +++ b/third_party/llvm-openmp/BUILD @@ -5,7 +5,6 @@ exports_files(["LICENSE.txt"]) load( "@org_tensorflow//third_party/llvm:llvm.bzl", "cmake_var_string", - "dict_add", "expand_cmake_vars", ) load( @@ -14,17 +13,17 @@ load( ) genrule( - name = "il8n_id", + name = "kmp_il8n_id", srcs = [ "runtime/tools/message-converter.pl", "runtime/src/i18n/en_US.txt", ], outs = ["include/kmp_i18n_id.inc"], - cmd = "$(location runtime/tools/message-converter.pl) --os=lin --prefix=kmp_i18n --enum=$@ $(location runtime/src/i18n/en_US.txt)", + cmd = "perl $(location runtime/tools/message-converter.pl) --os=lin --prefix=kmp_i18n --enum=$@ $(location runtime/src/i18n/en_US.txt)", ) genrule( - name = "kmp_i18n_default", + name = "kmp_il8n_default", srcs = [ "runtime/tools/message-converter.pl", "runtime/src/i18n/en_US.txt", @@ -49,12 +48,12 @@ omp_vars = { "LIBOMP_ENABLE_ASSERTIONS": 1, "LIBOMP_ENABLE_SHARED": 1, "LIBOMP_LEGAL_ARCH": "Intel(R) 64", - "LIBOMP_LIB_FILE": "libiomp5.so", + "LIBOMP_LIB_FILE": "libiomp5", "LIBOMP_VERSION_MAJOR": 5, "LIBOMP_VERSION_MINOR": 0, } -omp_all_cmake_vars = cmake_var_string(dict_add(omp_vars)) +omp_all_cmake_vars = cmake_var_string(omp_vars) expand_cmake_vars( name = "config_kmp", @@ -73,7 +72,6 @@ expand_cmake_vars( cc_binary( name = "libiomp5.so", srcs = glob([ - "runtime/src/*.h", "runtime/src/kmp_alloc.cpp", "runtime/src/kmp_atomic.cpp", "runtime/src/kmp_csupport.cpp", @@ -109,8 +107,8 @@ cc_binary( ]) + [ ":config_kmp", ":config_omp", - ":il8n_id", - ":kmp_i18n_default", + ":kmp_il8n_id", + ":kmp_il8n_default", ":ldscript", ], copts = ["-Domp_EXPORTS -D_GNU_SOURCE -D_REENTRANT"], diff --git a/third_party/llvm/BUILD b/third_party/llvm/BUILD index f2e079aad76..46cf18dd3da 100644 --- a/third_party/llvm/BUILD +++ b/third_party/llvm/BUILD @@ -2,5 +2,8 @@ py_binary( name = "expand_cmake_vars", srcs = ["expand_cmake_vars.py"], srcs_version = "PY2AND3", - visibility = ["//visibility:public"], + visibility = [ + "@llvm-openmp//:__subpackages__", + "@llvm-project//:__subpackages__", + ], ) diff --git a/third_party/llvm/expand_cmake_vars.py b/third_party/llvm/expand_cmake_vars.py index 067e4f88d5a..a8a4b9673ed 100644 --- a/third_party/llvm/expand_cmake_vars.py +++ b/third_party/llvm/expand_cmake_vars.py @@ -38,10 +38,10 @@ def _parse_args(argv): def _expand_variables(input_str, cmake_vars): - """Expands ${VARIABLE} and @VARIABLE@s in 'input_str', using dictionary 'cmake_vars'. + """Expands ${VARIABLE}s and @VARIABLE@s in 'input_str', using dictionary 'cmake_vars'. Args: - input_str: the string containing ${VARIABLE} and @VARIABLE@ expressions to expand. + input_str: the string containing ${VARIABLE} or @VARIABLE@ expressions to expand. cmake_vars: a dictionary mapping variable names to their values. Returns: diff --git a/third_party/llvm/llvm.bzl b/third_party/llvm/llvm.bzl index c2be9dca302..dcbaab9edd4 100644 --- a/third_party/llvm/llvm.bzl +++ b/third_party/llvm/llvm.bzl @@ -7,7 +7,7 @@ TODO(chandlerc): Currently this expresses include-based dependencies as correctly understood by the build system. """ -def dict_add(*dictionaries): +def _dict_add(*dictionaries): """Returns a new `dict` that has all the entries of the given dictionaries. If the same key is present in more than one of the input dictionaries, the @@ -305,7 +305,7 @@ win32_cmake_vars = { # than hardcoding x86_64. llvm_all_cmake_vars = select({ "@org_tensorflow//tensorflow:macos": cmake_var_string( - dict_add( + _dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-apple-darwin"), posix_cmake_vars, @@ -313,7 +313,7 @@ llvm_all_cmake_vars = select({ ), ), "@org_tensorflow//tensorflow:linux_ppc64le": cmake_var_string( - dict_add( + _dict_add( cmake_vars, llvm_target_cmake_vars("PowerPC", "powerpc64le-unknown-linux_gnu"), posix_cmake_vars, @@ -321,21 +321,21 @@ llvm_all_cmake_vars = select({ ), ), "@org_tensorflow//tensorflow:windows": cmake_var_string( - dict_add( + _dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-pc-win32"), win32_cmake_vars, ), ), "@org_tensorflow//tensorflow:freebsd": cmake_var_string( - dict_add( + _dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-unknown-freebsd"), posix_cmake_vars, ), ), "@org_tensorflow//tensorflow:linux_s390x": cmake_var_string( - dict_add( + _dict_add( cmake_vars, llvm_target_cmake_vars("SystemZ", "systemz-unknown-linux_gnu"), posix_cmake_vars, @@ -343,7 +343,7 @@ llvm_all_cmake_vars = select({ ), ), "//conditions:default": cmake_var_string( - dict_add( + _dict_add( cmake_vars, llvm_target_cmake_vars("X86", "x86_64-unknown-linux_gnu"), posix_cmake_vars, From 8754ae7756fb89b8ff675021fc636029a3722a4a Mon Sep 17 00:00:00 2001 From: "ag.ramesh" Date: Fri, 9 Oct 2020 17:39:18 -0700 Subject: [PATCH 5/6] More changes based on review comments. --- third_party/llvm-openmp/BUILD | 19 +++++++++++++++---- third_party/mkl/BUILD | 3 +++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/third_party/llvm-openmp/BUILD b/third_party/llvm-openmp/BUILD index 759e91e60fc..dcfb6d8ff8d 100644 --- a/third_party/llvm-openmp/BUILD +++ b/third_party/llvm-openmp/BUILD @@ -13,7 +13,7 @@ load( ) genrule( - name = "kmp_il8n_id", + name = "kmp_i18n_id", srcs = [ "runtime/tools/message-converter.pl", "runtime/src/i18n/en_US.txt", @@ -23,7 +23,7 @@ genrule( ) genrule( - name = "kmp_il8n_default", + name = "kmp_i18n_default", srcs = [ "runtime/tools/message-converter.pl", "runtime/src/i18n/en_US.txt", @@ -69,6 +69,17 @@ expand_cmake_vars( dst = "include/omp.h", ) +# TODO(Intel-tf) Replace the following cc_binary call with cc_library. +# cc_library should be used for files that are not independently executed. Using +# cc_library here results in the following linking errors. +# ERROR: //tensorflow/BUILD:689:1: Linking of rule '//tensorflow:libtensorflow_framework.so.2.4.0' failed (Exit 1) +# /usr/bin/ld.gold: error: symbol GOMP_parallel_loop_nonmonotonic_guided has undefined version VERSION +# /usr/bin/ld.gold: error: symbol GOMP_parallel_start has undefined version GOMP_1.0 +# /usr/bin/ld.gold: error: symbol GOMP_cancellation_point has undefined version GOMP_4.0 +# /usr/bin/ld.gold: error: symbol omp_set_num_threads has undefined version OMP_1.0 +# ...... +# ...... + cc_binary( name = "libiomp5.so", srcs = glob([ @@ -107,8 +118,8 @@ cc_binary( ]) + [ ":config_kmp", ":config_omp", - ":kmp_il8n_id", - ":kmp_il8n_default", + ":kmp_i18n_id", + ":kmp_i18n_default", ":ldscript", ], copts = ["-Domp_EXPORTS -D_GNU_SOURCE -D_REENTRANT"], diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD index 5cee0514a06..8b9e0e6b0bc 100644 --- a/third_party/mkl/BUILD +++ b/third_party/mkl/BUILD @@ -47,6 +47,9 @@ filegroup( visibility = ["//visibility:public"], ) +# TODO(Intel-tf) Remove the following call to cc_library and replace all uses +# of mkl_libs_linux with @llvm-openmp//:libiomp5.so directly. + cc_library( name = "mkl_libs_linux", srcs = [ From 935a62e4decdf930c0d2e64da23910ae6217dea9 Mon Sep 17 00:00:00 2001 From: "ag.ramesh" Date: Mon, 12 Oct 2020 19:37:06 -0700 Subject: [PATCH 6/6] Renamed llvm-openmp to llvm_openmp. --- tensorflow/workspace.bzl | 4 ++-- third_party/llvm/BUILD | 2 +- third_party/{llvm-openmp => llvm_openmp}/BUILD | 0 third_party/mkl/BUILD | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename third_party/{llvm-openmp => llvm_openmp}/BUILD (100%) diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 35d77d14e93..3099caad362 100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -722,8 +722,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""): # Intel openMP that is part of LLVM sources. tf_http_archive( - name = "llvm-openmp", - build_file = clean_dep("//third_party/llvm-openmp:BUILD"), + name = "llvm_openmp", + build_file = clean_dep("//third_party/llvm_openmp:BUILD"), sha256 = "d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44", strip_prefix = "openmp-10.0.1.src", urls = [ diff --git a/third_party/llvm/BUILD b/third_party/llvm/BUILD index 46cf18dd3da..d027832669d 100644 --- a/third_party/llvm/BUILD +++ b/third_party/llvm/BUILD @@ -3,7 +3,7 @@ py_binary( srcs = ["expand_cmake_vars.py"], srcs_version = "PY2AND3", visibility = [ - "@llvm-openmp//:__subpackages__", + "@llvm_openmp//:__subpackages__", "@llvm-project//:__subpackages__", ], ) diff --git a/third_party/llvm-openmp/BUILD b/third_party/llvm_openmp/BUILD similarity index 100% rename from third_party/llvm-openmp/BUILD rename to third_party/llvm_openmp/BUILD diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD index 8b9e0e6b0bc..61c06ba4d6b 100644 --- a/third_party/mkl/BUILD +++ b/third_party/mkl/BUILD @@ -34,7 +34,7 @@ filegroup( name = "LICENSE", srcs = ["MKL_LICENSE"] + select({ "@org_tensorflow//tensorflow:linux_x86_64": [ - "@llvm-openmp//:LICENSE.txt", + "@llvm_openmp//:LICENSE.txt", ], "@org_tensorflow//tensorflow:macos": [ "@mkl_darwin//:LICENSE", @@ -48,12 +48,12 @@ filegroup( ) # TODO(Intel-tf) Remove the following call to cc_library and replace all uses -# of mkl_libs_linux with @llvm-openmp//:libiomp5.so directly. +# of mkl_libs_linux with @llvm_openmp//:libiomp5.so directly. cc_library( name = "mkl_libs_linux", srcs = [ - "@llvm-openmp//:libiomp5.so", + "@llvm_openmp//:libiomp5.so", ], visibility = ["//visibility:public"], )