diff options
| author |  Sourabh Bajaj <sourabhbajaj@google.com> | 2018-01-17 13:14:48 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-01-17 13:18:49 -0800 |
| commit | d8697935d334bb0f2e1c9bccfe9a2a7bee9785cc (patch) | |
| tree | 134cec2030a5e3fd3edef20e739c133c8940f257 /tensorflow/tensorflow.bzl | |
| parent | 7699ea8bee2ee9d0d5c93706cf1357a36c60ef58 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 182258809
Diffstat (limited to 'tensorflow/tensorflow.bzl')
| -rw-r--r-- | tensorflow/tensorflow.bzl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 36acdd3c48..383c97344a 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -150,6 +150,12 @@ def if_darwin(a): "//conditions:default": [], }) +def if_override_eigen_strong_inline(a): + return select({ + clean_dep("//tensorflow:override_eigen_strong_inline"): a, + "//conditions:default": [], + }) + def get_win_copts(is_external=False): WINDOWS_COPTS = [ "/D__VERSION__=\\\"MSVC\\\"", @@ -196,7 +202,7 @@ def tf_copts(android_optimization_level_override="-O2", is_external=False): + if_linux_x86_64(["-msse3"]) + if_ios_x86_64(["-msse4.1"]) + select({ - "//tensorflow:framework_shared_object": [], + clean_dep("//tensorflow:framework_shared_object"): [], "//conditions:default": ["-DTENSORFLOW_MONOLITHIC_BUILD"], }) + select({ @@ -922,7 +928,8 @@ def tf_kernel_library(name, if not deps: deps = [] if not copts: - copts = tf_copts(is_external=is_external) + copts = [] + copts = copts + tf_copts(is_external=is_external) if prefix: if native.glob([prefix + "*.cu.cc"], exclude=["*test*"]): if not gpu_srcs: |