diff options
| author |  Shanqing Cai <cais@google.com> | 2017-01-19 11:46:48 -0500 |
|---|---|---|
| committer | Shanqing Cai <cais@google.com> | 2017-01-19 11:46:48 -0500 |
| commit | 8cb517fdb6e84aae1c699219479b23f67fa0dc40 (patch) | |
| tree | 3de667b1d00cf4a04818b3b57ab3e3b045021a6e /third_party | |
| parent | 4f76939d3648cb4b956960fbacf2221421e958d6 (diff) | |
| parent | 7fce98639e574b159a492c0b3ba6e7343272fa06 (diff) | |
Merge commit for internal changes
Fixed conflicts in by taking the latest from internal:
tensorflow/core/kernels/sparse_matmul_op.cc
tensorflow/workspace.bzl
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/jemalloc.BUILD | 2 | ||||
| -rw-r--r-- | third_party/llvm/llvm.BUILD | 8 | ||||
| -rw-r--r-- | third_party/werkzeug.BUILD | 14 |
3 files changed, 19 insertions, 5 deletions
diff --git a/third_party/jemalloc.BUILD b/third_party/jemalloc.BUILD index 2496d12627..aabff39d7b 100644 --- a/third_party/jemalloc.BUILD +++ b/third_party/jemalloc.BUILD @@ -5,7 +5,7 @@ licenses(["notice"]) # BSD exports_files(["COPYING"]) -load("@//third_party:common.bzl", "template_rule") +load("@%ws%//third_party:common.bzl", "template_rule") cc_library( name = "jemalloc", diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD index 0f7ef74545..330d8b79ce 100644 --- a/third_party/llvm/llvm.BUILD +++ b/third_party/llvm/llvm.BUILD @@ -7,18 +7,18 @@ licenses(["notice"]) exports_files(["LICENSE.TXT"]) load( - "@//third_party/llvm:llvm.bzl", + "@%ws%//third_party/llvm:llvm.bzl", "gentbl", "expand_cmake_vars", "llvm_target_cmake_vars", "cmake_var_string", ) load( - "@//third_party:common.bzl", + "@%ws%//third_party:common.bzl", "template_rule", ) -package(default_visibility = ["@//tensorflow/compiler/xla:internal"]) +package(default_visibility = ["@%ws%//tensorflow/compiler/xla:internal"]) llvm_host_triple = "x86_64-unknown-linux_gnu" @@ -147,7 +147,7 @@ darwin_cmake_vars = { # TODO(phawkins): use a better method to select the right host triple, rather # than hardcoding x86_64. all_cmake_vars = select({ - "@//tensorflow:darwin": cmake_var_string( + "@%ws%//tensorflow:darwin": cmake_var_string( cmake_vars + llvm_target_cmake_vars("X86", "x86_64-apple-darwin") + darwin_cmake_vars, ), diff --git a/third_party/werkzeug.BUILD b/third_party/werkzeug.BUILD new file mode 100644 index 0000000000..aaf1614bb9 --- /dev/null +++ b/third_party/werkzeug.BUILD @@ -0,0 +1,14 @@ +# Description: +# Werkzeug provides utilities for making WSGI applications + +licenses(["notice"]) # BSD 3-Clause + +exports_files(["LICENSE"]) + +# Note: this library includes test code. Consider creating a testonly target. +py_library( + name = "werkzeug", + srcs = glob(["werkzeug/werkzeug/*.py"]), + srcs_version = "PY2AND3", + visibility = ["//visibility:public"], +) |