diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2016-11-17 15:37:00 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-11-17 15:45:18 -0800 |
| commit | 54e5000e0b980abe905900599c4493fadae34a15 (patch) | |
| tree | c1f0751e5565882a77646589360fe090bec3f3fc /third_party/sycl | |
| parent | 8a5610cd9f0b7087c1a7e97071ba1cf9b885315a (diff) | |
Merge changes from github.
Change: 139516555
Diffstat (limited to 'third_party/sycl')
| -rwxr-xr-x | third_party/sycl/crosstool/computecpp.tpl | 4 | ||||
| -rw-r--r-- | third_party/sycl/sycl_configure.bzl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/third_party/sycl/crosstool/computecpp.tpl b/third_party/sycl/crosstool/computecpp.tpl index 4860e9f0a0..d319a1eb75 100755 --- a/third_party/sycl/crosstool/computecpp.tpl +++ b/third_party/sycl/crosstool/computecpp.tpl @@ -39,7 +39,7 @@ def main(): filename, file_extension = os.path.splitext(output_file_name) bc_out = filename + ".sycl" - computecpp_compiler_flags = ['-DTENSORFLOW_USE_SYCL', '-Wno-unused-variable','-I', COMPUTECPP_INCLUDE,'-isystem', + computecpp_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"] + computecpp_compiler_flags # dont want that in case of compiling with computecpp first @@ -50,7 +50,7 @@ def main(): x = subprocess.call([COMPUTECPP_DRIVER] +computecpp_compiler_flags ) if(x == 0): - host_compiler_flags = ['-DTENSORFLOW_USE_SYCL', '-Wno-unused-variable', '-I', COMPUTECPP_INCLUDE, "--include",bc_out] + host_compiler_flags + host_compiler_flags = ['-D_GLIBCXX_USE_CXX11_ABI=0', '-DTENSORFLOW_USE_SYCL', '-Wno-unused-variable', '-I', COMPUTECPP_INCLUDE, "--include",bc_out] + host_compiler_flags return subprocess.call([CPU_CXX_COMPILER] +host_compiler_flags ) return x else: diff --git a/third_party/sycl/sycl_configure.bzl b/third_party/sycl/sycl_configure.bzl index 2dd82198ff..6102ed49c2 100644 --- a/third_party/sycl/sycl_configure.bzl +++ b/third_party/sycl/sycl_configure.bzl @@ -134,8 +134,8 @@ error_sycl_disabled() def _create_dummy_repository(repository_ctx): # Set up BUILD file for sycl/. _file(repository_ctx, "sycl:build_defs.bzl") - _file(repository_ctx, "sycl:BUILD") - _file(repository_ctx, "sycl:platform.bzl") + _tpl(repository_ctx, "sycl:BUILD") + _tpl(repository_ctx, "sycl:platform.bzl") # Create dummy files for the SYCL toolkit since they are still required by # tensorflow/sycl/platform/default/build_config:sycl. @@ -157,8 +157,8 @@ def _sycl_autoconf_imp(repository_ctx): else: # copy template files _file(repository_ctx, "sycl:build_defs.bzl") - _file(repository_ctx, "sycl:BUILD") - _file(repository_ctx, "sycl:platform.bzl") + _tpl(repository_ctx, "sycl:BUILD") + _tpl(repository_ctx, "sycl:platform.bzl") _file(repository_ctx, "crosstool:BUILD") _tpl(repository_ctx, "crosstool:computecpp", { |