diff options
| author |  Martin Wicke <wicke@google.com> | 2017-03-23 12:31:16 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-03-23 13:44:29 -0700 |
| commit | bc456e361d49d1d89a74b80060c70efb51fd7d87 (patch) | |
| tree | 825e04287f1e2d2ac098ca3f0fdd4e361aefd68c /third_party | |
| parent | 8ca071456537e6c96ae8896c2a20b1f08b0e59d3 (diff) | |
Merge changes from github.
Change: 151046259
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/gpus/cuda_configure.bzl | 11 | ||||
| -rwxr-xr-x | third_party/sycl/crosstool/computecpp.tpl | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl index 01e070f2be..a2b3e7d79e 100644 --- a/third_party/gpus/cuda_configure.bzl +++ b/third_party/gpus/cuda_configure.bzl @@ -826,8 +826,17 @@ def _cuda_autoconf_impl(repository_ctx): cuda_configure = repository_rule( implementation = _cuda_autoconf_impl, - local = True, + environ = [ + _GCC_HOST_COMPILER_PATH, + "TF_NEED_CUDA", + _CUDA_TOOLKIT_PATH, + _CUDNN_INSTALL_PATH, + _TF_CUDA_VERSION, + _TF_CUDNN_VERSION, + _TF_CUDA_COMPUTE_CAPABILITIES, + ], ) + """Detects and configures the local CUDA toolchain. Add the following to your WORKSPACE FILE: diff --git a/third_party/sycl/crosstool/computecpp.tpl b/third_party/sycl/crosstool/computecpp.tpl index 66dd9aea7b..595e7136a6 100755 --- a/third_party/sycl/crosstool/computecpp.tpl +++ b/third_party/sycl/crosstool/computecpp.tpl @@ -65,7 +65,7 @@ def main(): # strip asan for the device computecpp_device_compiler_flags = ['-sycl-compress-name', '-DTENSORFLOW_USE_SYCL', '-Wno-unused-variable', '-I', COMPUTECPP_INCLUDE, '-isystem', COMPUTECPP_INCLUDE, '-std=c++11', '-sycl', '-emit-llvm', '-no-serial-memop', '-Xclang', '-cl-denorms-are-zero', '-Xclang', '-cl-fp32-correctly-rounded-divide-sqrt'] - computecpp_device_compiler_flags += [flag for flag in compiler_flags if not flag.startswith(('-fsanitize'))] + computecpp_device_compiler_flags += [flag for flag in compiler_flags if not flag.startswith(('-fsanitize', '-march=native', '-mavx'))] x = subprocess.call([COMPUTECPP_DRIVER] + computecpp_device_compiler_flags ) if(x == 0): |