diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2017-11-29 12:31:41 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-11-29 12:34:42 -0800 |
| commit | 97da160010a47ba37afa1afca914038d3ab0ba55 (patch) | |
| tree | 60c40381fa49b8042d440374a2e6b2d582f8b5e3 /tensorflow/tensorflow.bzl | |
| parent | dcf9b035a09904322020d87a9324f04bcaf89eec (diff) | |
Allow the toolchain defaults to be used instead of hard-coding -Os.
For example toolchains with clang may set -Oz which is more analogous to gcc's
-Os. -Os for clang is closer to -O2.
PiperOrigin-RevId: 177347371
Diffstat (limited to 'tensorflow/tensorflow.bzl')
| -rw-r--r-- | tensorflow/tensorflow.bzl | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 8d392fb36d..76ef59484f 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -167,7 +167,19 @@ WIN_COPTS = [ ] # LINT.IfChange -def tf_copts(): +def tf_copts(android_optimization_level_override="-O2"): + # For compatibility reasons, android_optimization_level_override + # is currently only being set for Android. + # To clear this value, and allow the CROSSTOOL default + # to be used, pass android_optimization_level_override=None + android_copts = [ + "-std=c++11", + "-DTF_LEAN_BINARY", + "-Wno-narrowing", + "-fomit-frame-pointer", + ] + if android_optimization_level_override: + android_copts.append(android_optimization_level_override) return ( if_not_windows([ "-DEIGEN_AVOID_STL_ARRAY", @@ -180,13 +192,7 @@ def tf_copts(): + if_android_arm(["-mfpu=neon"]) + if_linux_x86_64(["-msse3"]) + select({ - clean_dep("//tensorflow:android"): [ - "-std=c++11", - "-DTF_LEAN_BINARY", - "-O2", - "-Wno-narrowing", - "-fomit-frame-pointer", - ], + clean_dep("//tensorflow:android"): android_copts, clean_dep("//tensorflow:darwin"): [], clean_dep("//tensorflow:windows"): WIN_COPTS, clean_dep("//tensorflow:windows_msvc"): WIN_COPTS, |