From cc1b15d70e712ba111d9a8b73523e937e9db6631 Mon Sep 17 00:00:00 2001
From: Davide Libenzi <dlibenzi@google.com>
Date: Fri, 6 Dec 2019 09:57:07 -0800
Subject: [PATCH] Bring new TF.

---
 .circleci/build.sh            | 2 +-
 scripts/build_torch_wheels.sh | 2 +-
 setup.py                      | 2 +-
 test/cpp/CMakeLists.txt       | 2 +-
 third_party/tensorflow        | 2 +-
 third_party/xla_client/BUILD  | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/build.sh b/.circleci/build.sh
index 1fe3cc617746..83041b5648d5 100755
--- a/.circleci/build.sh
+++ b/.circleci/build.sh
@@ -50,7 +50,7 @@ sudo apt-get -qq install clang-7 clang++-7
 # Bazel dependencies
 sudo apt-get -qq install pkg-config zip zlib1g-dev unzip
 # XLA build requires Bazel
-wget https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel-0.24.1-installer-linux-x86_64.sh
+wget https://github.com/bazelbuild/bazel/releases/download/1.1.0/bazel-1.1.0-installer-linux-x86_64.sh
 chmod +x bazel-*.sh
 sudo ./bazel-*.sh
 BAZEL="$(which bazel)"
diff --git a/scripts/build_torch_wheels.sh b/scripts/build_torch_wheels.sh
index b3978da19416..5983f97d9a3e 100755
--- a/scripts/build_torch_wheels.sh
+++ b/scripts/build_torch_wheels.sh
@@ -9,7 +9,7 @@ DEFAULT_PYTHON_VERSION=3.6
 DEBIAN_FRONTEND=noninteractive
 
 function install_bazel() {
-  local BAZEL_VERSION="0.24.1"
+  local BAZEL_VERSION="1.1.0"
   local BAZEL_FILE="bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh"
   sudo apt-get install -y pkg-config zip zlib1g-dev unzip
   curl -L -O "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${BAZEL_FILE}"
diff --git a/setup.py b/setup.py
index 8ff0ed121664..14be1d93b165 100644
--- a/setup.py
+++ b/setup.py
@@ -186,7 +186,7 @@ def run(self):
 ]
 include_dirs += [
     third_party_path + '/tensorflow/bazel-tensorflow',
-    third_party_path + '/tensorflow/bazel-genfiles',
+    third_party_path + '/tensorflow/bazel-bin',
     third_party_path +
     '/tensorflow/bazel-tensorflow/external/protobuf_archive/src',
     third_party_path +
diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt
index 6ae18066e507..c36abb307423 100644
--- a/test/cpp/CMakeLists.txt
+++ b/test/cpp/CMakeLists.txt
@@ -78,7 +78,7 @@ target_include_directories(
   SYSTEM PUBLIC  
   "${SOURCE_DIR}/googletest/include"
   "${TFDIR}/bazel-tensorflow"
-  "${TFDIR}/bazel-genfiles"
+  "${TFDIR}/bazel-bin"
   "${TFDIR}/bazel-tensorflow/external/protobuf_archive/src"
   "${TFDIR}/bazel-tensorflow/external/com_google_protobuf/src"
   "${TFDIR}/bazel-tensorflow/external/eigen_archive"
diff --git a/third_party/tensorflow b/third_party/tensorflow
index e9bc15859dd3..e2f5c41688d8 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit e9bc15859dd38a44b298800a998de16f53f60343
+Subproject commit e2f5c41688d8af36756a6d9a97eca6785b30dae9
diff --git a/third_party/xla_client/BUILD b/third_party/xla_client/BUILD
index 1129022b533a..75ae7049cf5a 100644
--- a/third_party/xla_client/BUILD
+++ b/third_party/xla_client/BUILD
@@ -117,14 +117,14 @@ cc_library(
         "//tensorflow/compiler/xla:debug_options_flags",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:xla_proto",
+        "//tensorflow/compiler/xla:xla_proto_cc",
         "//tensorflow/compiler/xla/client",
         "//tensorflow/compiler/xla/client:global_data",
         "//tensorflow/compiler/xla/client:xla_computation",
         "//tensorflow/compiler/xla/rpc:grpc_stub",
         "//tensorflow/compiler/xla/service:cpu_plugin",
         "//tensorflow/compiler/xla/service:platform_util",
-        "//tensorflow/compiler/xrt:xrt_proto",
+        "//tensorflow/compiler/xrt:xrt_proto_cc",
         "//tensorflow/compiler/xrt:xrt_server",
         "//tensorflow/compiler/xrt/cc:xrt_ops",
         "//tensorflow/core:core_cpu",